Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

# Conflicts:
#	nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPayController.java

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPayController.java

@@ -315,7 +315,6 @@ public class WechatPayController {
 
     @PostMapping("/getUserInfo")
     public JSONObject getWxUserInfo(@RequestBody Map<String, String> params) throws Exception {
-//        String accessToken = getToken(GET_TOKEN_URL, "wx8fc3e4305d2fbf0b", "3bf3dd4ec72f591432db6b28c2c044e5");// 获取token
         String accessToken = params.get("access_token");
         String openid = params.get("openid");
         System.out.println("---------token-------" + accessToken);
@@ -341,9 +340,10 @@ public class WechatPayController {
 
 
     @PostMapping("/getJsApiInfo")
-    public static Map<String, String> getJsApiInfo(@RequestBody Map<String, String> params) throws Exception {
+    public Map<String,String> getJsApiInfo(@RequestBody Map<String,String> params) throws Exception {
-//        String accessToken = getToken(GET_TOKEN_URL, "wx8fc3e4305d2fbf0b", "3bf3dd4ec72f591432db6b28c2c044e5");// 获取token
+        String accessToken = getToken(GET_TOKEN_URL, wechatpayConfig.getAppid(), wechatpayConfig.getAppsecret());// 获取token
-        String accessToken = params.get("access_token");
+        String firstUrl = params.get("url");
+        System.out.println("---------firstUrl-------"+firstUrl);
         System.out.println("---------token-------" + accessToken);
         // 构造请求URL
         String requestUrl = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + accessToken + "&type=jsapi";
@@ -364,13 +364,21 @@ public class WechatPayController {
         String ticket = String.valueOf(jsonObject.get("ticket"));
         String nonceStr = UUID.randomUUID().toString();
         String timestamp = Long.toString(System.currentTimeMillis() / 1000);
-        String string1 = new StringBuilder("jsapi_ticket=").append(ticket).append("&noncestr=").append(nonceStr).append("&timestamp=").append(timestamp).toString();// 得到签名
+        String string1 =   new StringBuilder("jsapi_ticket=").append(ticket)
+                .append("&noncestr=")
+                .append(nonceStr)
+                .append("&timestamp=")
+                .append(timestamp)
+                .append("&url=")
+                .append(firstUrl)
+                .toString();// 得到签名
         String signature = encryptSHA(string1);
 
         Map<String, String> map = new HashMap<String, String>();
         map.put("signature", signature);
         map.put("timestamp", timestamp);
         map.put("nonceStr", nonceStr);
+        map.put("firstUrl", firstUrl);
 
         System.out.println("---------jsonObject-------" + signature);
         return map;

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/entity/WechatpayConfig.java

@@ -33,6 +33,10 @@ public class WechatpayConfig {
     @Value("${wxpay.notify-domain}")
     private String notifyDomain;
 
+    // APPID
+    @Value("${wxpay.appsecret}")
+    private String appsecret;
+
 
 
 }

nursing-unit-system/nu-system-start/src/main/resources/application-dev-nu002.yml

@@ -395,6 +395,8 @@ wxpay:
   api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
   # APPID
   appid: wx8fc3e4305d2fbf0b
+  # appsecret
+  appsecret: 3bf3dd4ec72f591432db6b28c2c044e5
   # 商户ID
   mch-id: 1717618860
   # 商户API证书序列号

nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml

@@ -391,6 +391,8 @@ wxpay:
   api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
   # APPID
   appid: wx8fc3e4305d2fbf0b
+  # appsecret
+  appsecret: 3bf3dd4ec72f591432db6b28c2c044e5
   # 商户ID
   mch-id: 1717618860
   # 商户API证书序列号

nursing-unit-system/nu-system-start/src/main/resources/application-uat.yml

@@ -389,6 +389,8 @@ wxpay:
   api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
   # APPID
   appid: wx8fc3e4305d2fbf0b
+  # appsecret
+  appsecret: 3bf3dd4ec72f591432db6b28c2c044e5
   # 商户ID
   mch-id: 1717618860
   # 商户API证书序列号