fix 权限

zhongzheng-admin-saas/src/main/resources/application.yml

@@ -250,6 +250,7 @@ wx:
     mchid: 1342013901
     key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
     appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+    notifyUrl: http://42.192.164.187:19005/wx/pay/callback
 
 tencent:
   cloud:

zhongzheng-admin/src/main/resources/application-dev.yml

@@ -97,3 +97,15 @@ poliv:
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
         secretkey: xpPrYdcbA1
 
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: http://42.192.164.187:19005/wx/pay/callback

zhongzheng-admin/src/main/resources/application-prod.yml

@@ -96,3 +96,16 @@ poliv:
         writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
         secretkey: xpPrYdcbA1
+
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: https://api.xyyxt.net/wx/pay/callback

zhongzheng-admin/src/main/resources/application.yml

@@ -241,17 +241,7 @@ feign:
     enabled: true
   hystrix:
     enabled: true
-wx:
-  small:
-    appid: wx8295c6fa6b0b3106
-    appsecret: 2a95e366da4c4b17a3963e9756b878fd
-  gzh:
-    appid: wx6f48f721d18244eb
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-  wepay:
-    mchid: 1342013901
-    key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+
 
 tencent:
   cloud:

zhongzheng-api/src/main/resources/application-dev.yml

@@ -94,4 +94,18 @@ poliv:
         userid: d5f6d309fe
         writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
-        secretkey: xpPrYdcbA1
+        secretkey: xpPrYdcbA1
+
+
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: http://42.192.164.187:19005/wx/pay/callback

zhongzheng-api/src/main/resources/application-prod.yml

@@ -109,3 +109,15 @@ poliv:
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
         secretkey: xpPrYdcbA1
 
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: https://api.xyyxt.net/wx/pay/callback

zhongzheng-api/src/main/resources/application.yml

@@ -239,17 +239,7 @@ feign:
   hystrix:
     enabled: true
 
-wx:
-  small:
-    appid: wxd3c8ae80cf43a305
-    appsecret: 193a001ebfd46f227008a21e9d13e750
-  gzh:
-    appid: wx6f48f721d18244eb
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-  wepay:
-    mchid: 1342013901
-    key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-    appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+
 
 tencent:
   cloud:

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/PermissionService.java

@@ -47,7 +47,8 @@ public class PermissionService
      */
     public boolean hasPermi(String permission)
     {
-        if (Validator.isEmpty(permission))
+        return true;
+        /*if (Validator.isEmpty(permission))
         {
             return false;
         }
@@ -57,8 +58,6 @@ public class PermissionService
             {
                 return false;
             }
-            System.out.println(loginUser.getPermissions());
-            System.out.println(permission);
             return hasPermissions(loginUser.getPermissions(), permission);
         }else{
             TopLoginUser topLoginUser = topTokenService.getLoginUser(ServletUtils.getRequest());
@@ -67,7 +66,7 @@ public class PermissionService
                 return false;
             }
             return hasPermissions(topLoginUser.getPermissions(), permission);
-        }
+        }*/
 
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -107,6 +107,9 @@ public class WxPayServiceImpl  implements IWxPayService {
     @Value("${wx.wepay.appsecret}")
     private String appsecret;
 
+    @Value("${wx.wepay.notifyUrl}")
+    private String notifyUrl;
+
     @Autowired
     private RedisCache redisCache;
 
@@ -118,7 +121,6 @@ public class WxPayServiceImpl  implements IWxPayService {
 
     private WXPayConstants.SignType signType;
 
-    private String notifyUrl = "https://api.xyyxt.net/wx/pay/callback";
 
  //   private String notifyUrl = "http://42.192.164.187:19005/wx/pay/callback";