fix: 多余工具类清理

admin/src/main/java/com/onsiteservice/admin/security/SecurityService.java

@@ -35,7 +35,7 @@ public class SecurityService {
     private SysUserMapper sysUserMapper;
     @Resource
     private HttpServletRequest httpServletRequest;
-    @Value("${project.admin-security.ant-paths}")
+    @Value("${project.jwt.ant-paths}")
     private String antPaths;
 
     /**

admin/src/main/resources/application.yaml

@@ -14,12 +14,12 @@ project:
     secret: b25zaXRlLXNlcnZpY2UtYWRtaW4tYmFzZTY0LXNlY3JldA==
     issuer: onsite-service-admin
     expires-time: 86400  # 1天有效期 秒
+    # 无需授权url资源
+    ant-paths: "/error,/websocket/**,/api,/token/base,/monitor/**,/dict,/login,/doc.html,/webjars/**,/swagger**,
+    /swagger-resources/configuration/ui,/**/v2/api-docs"
   admin-security:
     enabled: true
     custom-security: false  # url级别验证开关
-    # 无需授权url资源
-    ant-paths: "/error,/websocket/**,/api,/token/base,/monitor/**,\
-    /,/dict,/login/init,/login,/sys/user/info"
 
 spring:
   profiles:

common/src/main/java/com/onsiteservice/common/annotation/user/CurrentUserIdResolver.java

@@ -63,6 +63,7 @@ public class CurrentUserIdResolver implements HandlerMethodArgumentResolver {
                 throw new ServiceException("@CurrentUserId参数类型错误 支持Long或Integer或String");
             }
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("异常信息: " + e.getMessage());
             throw new RuntimeException("CurrentUserIdResolver获取当前请求用户id异常");
         }

constant/src/main/resources/application-third-service.yaml

@@ -23,8 +23,13 @@ aliyun:
 
 # 微信配置
 wx:
-  mappid: wxdc9fe9e7aaeddac4
-  appid: wxa56f0845ca456bac
+  # 小程序
+  miniapp:
+    appid: wx8545a0628f59136b  #微信小程序的appid
+    secret: 9733fd4d1bebc6d7cdf041b897d88480 #微信小程序的Secret
+    token:    #微信小程序消息服务器配置的token
+    aesKey:    #微信小程序消息服务器配置的EncodingAESKey
+    msgDataFormat: JSON
   # 微信支付
   pay:
     appId: wxa56f0845ca456bac    #微信公众号或者小程序等的appid

core/src/main/java/com/onsiteservice/core/config/MvcConfig.java

@@ -148,7 +148,7 @@ public class MvcConfig implements WebMvcConfigurer {
                 }
                 for (FieldError fieldError : fieldErrorList) {
                     // 注解验证信息
-                    paramsErrors.add(fieldError.getField() + fieldError.getDefaultMessage());
+                    paramsErrors.add(fieldError.getDefaultMessage());
                 }
                 errorMsg = paramsErrors.toString();
             }

mini-app/src/main/java/com/onsiteservice/miniapp/service/weixin/pay/WechatNativePay.java

 package com.onsiteservice.miniapp.service.weixin.pay;
 
 import com.onsiteservice.core.exception.ServiceException;
-import com.onsiteservice.miniapp.service.weixin.pay.config.*;
+import com.onsiteservice.miniapp.service.weixin.pay.config.WXPayConstants;
+import com.onsiteservice.miniapp.service.weixin.pay.config.WechatPayMini;
+import com.onsiteservice.miniapp.service.weixin.pay.config.WechatPayMyConfigMini;
 import com.onsiteservice.miniapp.service.weixin.pay.util.*;
+import com.onsiteservice.util.IPUtils;
+import com.onsiteservice.util.UUIDUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,6 +15,7 @@ import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * @author: qiaobin
@@ -67,7 +72,7 @@ public class WechatNativePay {
         data.put("fee_type", "CNY");
         data.put("openid", openId);
         data.put("total_fee", String.valueOf(total_fee.intValue()));
-        data.put("spbill_create_ip", IPUtil.getIpAddress(request));
+        data.put("spbill_create_ip", IPUtils.getIpAddr(request));
         data.put("notify_url", notifyUrl);
         data.put("trade_type", "JSAPI");  // 此处指定为小程序支付
         data.put("nonce_str", UUIDGenerator.generate());
@@ -104,7 +109,7 @@ public class WechatNativePay {
         String resultCode = "";
         HashMap<String, String> prepayMap = new HashMap<>();
         prepayMap.put("appid", appId);
-        prepayMap.put("nonce_str", UUIDUtil.createUUID());
+        prepayMap.put("nonce_str", UUID.randomUUID().toString().replaceAll("-", ""));
         prepayMap.put("mch_id", mchId);
         prepayMap.put("notify_url", refundNotifyUrl);
         prepayMap.put("out_trade_no", out_trade_no);

mini-app/src/main/java/com/onsiteservice/miniapp/service/weixin/pay/util/IPUtil.java

-package com.onsiteservice.miniapp.service.weixin.pay.util;
-
-import com.common.util.Utils;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * 
- * @description 获取客户端IP
- * @author wangyu
- *
- */
-public class IPUtil {
-	public static String getIpAddress(HttpServletRequest request) {
-		return Utils.getIpAddress(request);
-	}
-}

mini-app/src/main/java/com/onsiteservice/miniapp/service/weixin/pay/util/UUIDUtil.java

-package com.onsiteservice.miniapp.service.weixin.pay.util;
-
-import java.util.UUID;
-
-/**
- * @author wang jianguo
- * @date 2020/10/20 15:14
- * @email qizhi1a440@outlook.com
- * @description:
- */
-public class UUIDUtil {
-    public static String createUUID() {
-        return UUID.randomUUID().toString().replaceAll("-", "");
-    }
-}