微信移动端支付

.idea/workspace.xml

@@ -30,8 +30,7 @@
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WxPayService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WxPayService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/resources/config/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -457,14 +456,7 @@
       <workItem from="1734579234738" duration="258000" />
       <workItem from="1734579502121" duration="1272000" />
       <workItem from="1734658594781" duration="126472000" />
-      <workItem from="1735184825354" duration="117045000" />
-    </task>
-    <task id="LOCAL-00018" summary="调查报告新增配置美元和元">
-      <created>1687918520963</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1687918520963</updated>
+      <workItem from="1735184825354" duration="122728000" />
     </task>
     <task id="LOCAL-00019" summary="更新">
       <created>1689070205980</created>
@@ -802,7 +794,14 @@
       <option name="project" value="LOCAL" />
       <updated>1735884233628</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="微信移动端支付">
+      <created>1735886486097</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1735886486097</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -885,20 +884,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="微信移动端支付" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java</url>
-          <line>316</line>
-          <option name="timeStamp" value="70" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java</url>
-          <line>268</line>
-          <option name="timeStamp" value="74" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

modules/bjflapi/src/main/java/com/jeesite/modules/bjflapi/report/WebsiteUserControllerApi.java

@@ -45,6 +45,8 @@ public class WebsiteUserControllerApi extends AbstractController {
     private WebsiteUserService websiteUserService;
     @Value("${token.expiretime}")
     private int EXPIRE;
+    @Value("${websiteUser.resetUrl}")
+    private String resetUrlStr;
 
     @GetMapping(value = "getValidCode")
     public String getValidCode(String unTime, HttpServletResponse response) throws Exception {
@@ -234,8 +236,7 @@ public class WebsiteUserControllerApi extends AbstractController {
         // 设置token缓存有效时间
         redisUtil.set(Constants.PREFIX_USER_FORGET_TOKEN + uuid, websiteUser.getId());
         redisUtil.expire(Constants.PREFIX_USER_FORGET_TOKEN + uuid, 7200);
-        // TODO 构建重置密码的链接
-        String resetUrl = "http://yourdomain.com/resetPassword.html?token=" + uuid;
+        String resetUrl = resetUrlStr + "?token=" + uuid;
         // 准备邮件内容，包含重置密码链接
         String emailContent = "请点击以下链接重置密码: <a href='" + resetUrl + "'>" + resetUrl + "</a>";
         EmailUtils.send(email, "找回密码，请点击以下链接重置密码", emailContent);

web/src/main/resources/config/application.yml

@@ -959,4 +959,7 @@ wxpay:
   # 商户证书序列号
   merchantSerialNumber: 1BAA3C96C5BF0E3B57796EEC0DF61E3A346B1C64
   # 商户APIV3密钥
-  apiV3Key: gaux2PjT2vwtcRNvvH5EKpuhIUNe1djN
+  apiV3Key: gaux2PjT2vwtcRNvvH5EKpuhIUNe1djN
+
+websiteUser:
+  resetUrl: http://192.168.0.247:8080/mine/updatePwd