From 2df0f324cba71f6989d19807d94830c8c2aedb11 Mon Sep 17 00:00:00 2001
From: zhengziru <zzr123456>
Date: Thu, 3 Apr 2025 09:49:13 +0800
Subject: [PATCH] server_commit

---
 .../io/v/nutz/base/payment/wxpay/util/WeChatUtils.java     | 4 ++--
 .../sys/controllers/platform/sys/SysWechatController.java  | 7 +++++--
 src/main/java/io/v/nutz/web/commons/base/Globals.java      | 2 +-
 .../web/commons/shiro/config/EasyCredentialsMatch.java     | 2 +-
 src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt   | 1 +
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt

diff --git a/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java b/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
index e1dd698..ed19068 100644
--- a/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
+++ b/src/main/java/io/v/nutz/base/payment/wxpay/util/WeChatUtils.java
@@ -29,9 +29,9 @@ public class WeChatUtils {
     @Inject
     private RedisService redisService;
 
-    public static final String APPID = "wxf12fa6175ec7c75f";
+    public static final String APPID = "wx0ad18b7f3c9ad6ab";
 
-    public static final String SECRET = "f65bbb41d3de4a93c8c93d8e2fd50369";
+    public static final String SECRET = "306cd98e99b10f48cb4244da950376f8";
 
     // 获取code
     public final static String CODE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=APPID&redirect_uri=REDIRECT_URI&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
index 2fa87bc..2ff5659 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/SysWechatController.java
@@ -49,7 +49,7 @@ public class SysWechatController {
     // 哈师大公众号appid
     private static final String APPID = "wx0ad18b7f3c9ad6ab";
     // 哈师大公众号app_secret 还未修改
-    private static final String SECRET = "f65bbb41d3de4a93c8c93d8e2fd50369";
+    private static final String SECRET = "306cd98e99b10f48cb4244da950376f8";
 
 
     @Inject
@@ -73,7 +73,8 @@ public class SysWechatController {
     @At
     @Ok("re")
     public String oauth(@Param("redirectUrl") String redirectUrl) {
-        String redirect = Globals.AppDomain + "/platform/wechat/getCode";
+//        String redirect = Globals.AppDomain + "platform/wechat/getCode";
+        String redirect = "http://zhgh.hrbnu.edu.cn/platform/wechat/getCode";
         if (StrUtil.isNotBlank(redirectUrl)) {
             redirect += "?redirect=" + redirectUrl;
         }
@@ -110,10 +111,12 @@ public class SysWechatController {
 
         if (sysUser == null) {
             String s = Globals.AppDomain + "/platform/wechat/doLogin?openid=" + openid;
+//            String s = "http://zhgh.hrbnu.edu.cn/sso/login?openid=" + openid;
             if (StrUtil.isNotBlank(redirect)) {
                 s += "&redirect=" + URLEncoder.encode(redirect, StandardCharsets.UTF_8);
             }
             return ">>:" + Globals.CasAddress + "/login?service=" + URLEncoder.encode(s, StandardCharsets.UTF_8);
+//            return ">>:" + Globals.CasAddress + "/login;
         }
 
         String loginName = Optional.ofNullable(sysUser).map(Sys_user::getLoginname).orElse(null);
diff --git a/src/main/java/io/v/nutz/web/commons/base/Globals.java b/src/main/java/io/v/nutz/web/commons/base/Globals.java
index 10c41c6..d933f65 100644
--- a/src/main/java/io/v/nutz/web/commons/base/Globals.java
+++ b/src/main/java/io/v/nutz/web/commons/base/Globals.java
@@ -53,7 +53,7 @@ public class Globals {
     //项目短名称
     public static String AppShrotName = "";
     //项目域名 (设置一个默认的 为优先级考虑)
-    public static String AppDomain = "https://zhgh.hrbnu.edu.cn";
+    public static String AppDomain = "http://zhgh.hrbnu.edu.cn";
     //cas地址 //http://noa.hrbnu.edu.cn/login/OAlogin.jsp#/?_key=vbuw0p
     public static String CasAddress = "http://pass.hrbnu.edu.cn/tpass";
     //文件访问域名
diff --git a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
index 95292b9..45100c5 100644
--- a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
+++ b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java
@@ -31,7 +31,7 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher {
             return true;
         }
 
-        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "zxcvbnmqwer");
+        String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "@dd3s#3618");
 
         if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) {
             return true;
diff --git a/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt b/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt
new file mode 100644
index 0000000..bc5d5f1
--- /dev/null
+++ b/src/main/resources/static/MP_verify_r7PbzGPoxZ8CYYar.txt
@@ -0,0 +1 @@
+r7PbzGPoxZ8CYYar
\ No newline at end of file