V1.0.0

education_family/.idea/workspace.xml

@@ -6,49 +6,9 @@
   <component name="ChangeListManager">
     <list default="true" id="d8501681-0944-4d49-82f9-09aabb10da6a" name="变更" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apiclient_key.pem" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/resources/apiclient_key.pem" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/common_utils/src/main/java/com/xunwang/commonutils/JwtUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/common_utils/src/main/java/com/xunwang/commonutils/JwtUtils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/common_utils/target/classes/com/xunwang/commonutils/JwtUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/common_utils/target/classes/com/xunwang/commonutils/JwtUtils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/infrastructure/api_gateway/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/infrastructure/api_gateway/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/EducationApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/EducationApplication.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/HomeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/HomeController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/TeacherCoursesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/TeacherCoursesController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/feign/PayFeign.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/feign/PayFeign.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/StudentRequirementsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/StudentRequirementsMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/TeacherCoursesMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/TeacherCoursesMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/StudentRequirementsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/StudentRequirementsMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/TeacherCoursesMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/TeacherCoursesMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/TeacherCoursesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/TeacherCoursesService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/impl/InviteInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/impl/InviteInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/impl/TeacherCoursesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/service/impl/TeacherCoursesServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/test/java/com/xunwang/education/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/test/java/com/xunwang/education/CodeGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-file/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-file/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-file/src/main/java/com/xunwang/file/controller/FileUpload.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-file/src/main/java/com/xunwang/file/controller/FileUpload.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-file/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-file/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-file/src/test/java/com/xunwang/file/ServiceFileApplicationTests.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-payment/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/config/WxPayConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/config/WxPayConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-ucenter/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-ucenter/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/components/my-userinfo/my-userinfo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/components/my-userinfo/my-userinfo.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/manifest.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/pages.json" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/pages/home/home.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages/home/home.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/pages/student/student.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages/student/student.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/pages/teacher/teacher.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages/teacher/teacher.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/manager/complaint/manager_complaint_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/complaint/manager_complaint_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/manager/suggestion/manager_suggestion_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/suggestion/manager_suggestion_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/complaint/my_complaint_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/complaint/my_complaint_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_receive_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_receive_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_send_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_send_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/order/my_order_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/order/my_order_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/suggestion/my_suggestion_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/suggestion/my_suggestion_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/student/order/student_order_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/order/student_order_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_all_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_all_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_my_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_my_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_all_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_all_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_my_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_my_detail.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/service/impl/OrderInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/service/impl/OrderInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/service-payment/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../education_uni/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/main.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,12 +55,12 @@
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/86180/Desktop/新讯网/家教/mengyuan/family/education_family/service/service-ucenter/src/main/java/com/xunwang/ucenter/service&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/86180/Desktop/新讯网/家教/mengyuan/family/education_family/service/service-payment/src/main/java/com/xunwang/payment&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
     &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
     &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
@@ -113,6 +73,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\86180\Desktop\新讯网\家教\mengyuan\family\education_family\service\service-payment\src\main\java\com\xunwang\payment" />
       <recent name="C:\Users\86180\Desktop\新讯网\家教\mengyuan\family\education_family\service\service-ucenter\src\main\java\com\xunwang\ucenter\service" />
       <recent name="C:\Users\86180\Desktop\新讯网\家教\mengyuan\family\education_family\service\service-ucenter\src\main\java\com\xunwang\ucenter\entity" />
       <recent name="C:\Users\86180\Desktop\新讯网\家教\mengyuan\family\education_family\service\service-ucenter\src\main\java\com\xunwang\ucenter\mapper" />
@@ -124,10 +85,11 @@
       <recent name="C:\Users\86180\Desktop\新讯网\家教\mengyuan\family\education_family\service\service-ucenter\src\main\java\com\xunwang\ucenter\controller" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.xunwang.payment.filter" />
+      <recent name="com.xunwang.payment.config" />
       <recent name="com.xunwang.payment.feign" />
       <recent name="com.xunwang.ucenter.entity.vo" />
       <recent name="com.xunwang.education.entity.vo" />
-      <recent name="com.xunwang.education.entity.dto" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -137,7 +99,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ServiceFileApplication">
+  <component name="RunManager" selected="Spring Boot.ServicePaymentApplication">
     <configuration name="CodeGenerator.run" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="service-education" />
       <extension name="coverage">
@@ -241,6 +203,11 @@
       <workItem from="1682562789445" duration="8727000" />
       <workItem from="1682583011822" duration="2548000" />
       <workItem from="1682586247834" duration="1408000" />
+      <workItem from="1682591466648" duration="3813000" />
+      <workItem from="1682650727402" duration="21000" />
+      <workItem from="1682651600115" duration="2685000" />
+      <workItem from="1683186408426" duration="179000" />
+      <workItem from="1683277922914" duration="1691000" />
     </task>
     <servers />
   </component>

education_family/service/service-payment/src/main/java/com/xunwang/payment/service/impl/OrderInfoServiceImpl.java

@@ -73,14 +73,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         String studentId = "";
         String uid = null;
         if ("教员".equals(identity)) {
-            uid = inviteInfo.getToUid();
+            uid = inviteInfo.getFromUid();
             teacherId = inviteInfo.getFromUid();
             teacherName = inviteInfo.getFromUname();
             studentName = inviteInfo.getToUname();
             studentId = inviteInfo.getToUid();
         }
         if ("学员".equals(identity)) {
-            uid = inviteInfo.getFromUid();
+            uid = inviteInfo.getToUid();
             teacherId = inviteInfo.getToUid();
             teacherName = inviteInfo.getToUname();
             studentName = inviteInfo.getFromUname();

education_family/service/service-payment/src/main/resources/application.yml

@@ -33,6 +33,32 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
 
+    #使用服务发现路由
+    gateway:
+      discovery:
+        locator:
+          enabled: true
+      routes:
+        - id: SERVICE-PAYMENT
+          uri: lb://SERVICE-PAYMENT
+          predicates:
+            - Path=/payment/**
+
+        - id: SERVICE-UCENTER
+          uri: lb://SERVICE-UCENTER
+          predicates:
+            - Path=/ucenter/** # 路径匹配
+
+        - id: SERVICE-EDUCATION
+          uri: lb://SERVICE-EDUCATION
+          predicates:
+            - Path=/education/**
+
+        - id: SERVICE-FILE
+          uri: lb://SERVICE-FILE
+          predicates:
+            - Path=/file/**
+
 mybatis-plus:
   global-config:
     db-config:

education_uni/main.js

@@ -12,9 +12,9 @@ import { $http } from '@escook/request-miniprogram'
 uni.$http = $http
 
 // 请求的根路径
-$http.baseUrl = 'http://125.71.216.35:8222'
+$http.baseUrl = 'https://hometeacher2.natappvip.cc'
 
-uni.$wsLocation = 'ws://125.71.216.35:8222'
+uni.$wsLocation = 'wss://hometeacher2.natappvip.cc'
 
 // 封装弹窗的方法
 uni.$showMsg = function (title = '数据加载失败！', duration = 1500) {