Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYang...

xuhy

2025-08-20 21b672143b34eb7e7014f3ff6beded581609f086

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing into dev

 MinistryOfTransport/src/main/java/com/sinata/ministryoftransport/util/MinistryOfTransport.java

@@ -24,7 +24,7 @@

    private final String Source = "0";//消息来源标识

    private final String url = "http://123.59.106.162:48085";
    private final String url = "http://106.37.198.208:8085";

    @Autowired
    private HttpClientUtil httpClientUtil;

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java

@@ -12,7 +12,7 @@

    String SECRET = "defaultSecret";

    Long EXPIRATION = 604800L;
    Long EXPIRATION = 31536000L;

    String AUTH_PATH = "/gunsApi/auth";


 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -1101,7 +1101,7 @@
        boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
                usernamePasswordToken, simpleAuthenticationInfo);
        String s = JwtTokenUtil.generateToken(String.valueOf(userInfo.getId()));
        redisUtil.setStrValue(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 7 * 24 * 60 * 60);
        redisUtil.setStrValue(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 365 * 24 * 60 * 60);
        redisUtil.setStrValue("USER_" + userInfo.getPhone(), s.substring(s.length() - 32));
        redisUtil.setStrValue("USER_" + userInfo.getId(), s);
        return s;

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PayMoneyUtil.java

@@ -866,7 +866,7 @@
        Config config = new RSAAutoCertificateConfig.Builder()
                    .merchantId(mchId)
                    .privateKeyFromPath("D:\\app\\cert\\weixin\\1602881362\\apiclient_key.pem")
                    .merchantSerialNumber("7D555A6E50E9205504024685DF6B821319C4DD70")
                    .merchantSerialNumber("4CEAF65279E636E313365ED0FB34A918F1BDAACD")
                    .apiV3Key("MIIEvQIBADANBgkqhkiG9w0BAQEFAASC")
                    .build();
        // 构建service