1.0.3

education_family/.idea/encodings.xml

@@ -6,6 +6,7 @@
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/infrastructure/api_gateway/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/infrastructure/api_gateway/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/infrastructure/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/infrastructure/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service/service-education/src/main/java" charset="UTF-8" />

education_family/.idea/misc.xml

@@ -13,5 +13,5 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

education_family/.idea/workspace.xml

@@ -5,84 +5,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8501681-0944-4d49-82f9-09aabb10da6a" name="变更" comment="">
-      <change afterPath="$PROJECT_DIR$/../education_uni/components/my-userinfo/my-userinfo.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../education_uni/static/rightwhite.png" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/service_base/src/main/java/com/xunwang/servicebase/utils/RandomNameUtils.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/service_base/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/service_base/pom.xml" 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$/infrastructure/api_gateway/src/main/java/com/xunwang/gateway/filter/AuthGlobalFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/infrastructure/api_gateway/src/main/java/com/xunwang/gateway/filter/AuthGlobalFilter.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/infrastructure/api_gateway/target/classes/com/xunwang/gateway/filter/AuthGlobalFilter.class" beforeDir="false" afterPath="$PROJECT_DIR$/infrastructure/api_gateway/target/classes/com/xunwang/gateway/filter/AuthGlobalFilter.class" 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/controller/InviteInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/InviteInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/StudentRequirementsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/controller/StudentRequirementsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/StuNeeds.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/StuNeeds.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/dto/MyStuNeedsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/dto/MyStuNeedsDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/socket/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/socket/Message.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/handler/ChatEndpoint.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/handler/ChatEndpoint.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/MyFavoriteNeedsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/mapper/xml/MyFavoriteNeedsMapper.xml" 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/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/util/MessageUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/util/MessageUtil.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-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/controller/OrderInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/controller/OrderInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/mapper/xml/OrderInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-payment/src/main/java/com/xunwang/payment/mapper/xml/OrderInfoMapper.xml" 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$/service/service-ucenter/src/main/java/com/xunwang/ucenter/service/impl/MiniProgramOpenidUidServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-ucenter/src/main/java/com/xunwang/ucenter/service/impl/MiniProgramOpenidUidServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/components/my-coursedetail/my-coursedetail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/components/my-coursedetail/my-coursedetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/components/my-invite/my-invite.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/components/my-invite/my-invite.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/components/my-requiredetail/my-requiredetail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/components/my-requiredetail/my-requiredetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/components/xb-swiper-preview/index.vue" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/main.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/package-lock.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/message/message.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages/message/message.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/pages/my/my.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/pages/my/my.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/static/avatar.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/static/xb-swiper-preview/icon-back.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/manager/complaint/manager_complaint.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/complaint/manager_complaint.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/complaint/manager_complaint_handle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/complaint/manager_complaint_handle.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/manager/manager.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/manager.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/manager/suggestion/manager_suggestion.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/suggestion/manager_suggestion.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/manager/suggestion/manager_suggestion_handle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/manager/suggestion/manager_suggestion_handle.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/complaint/my_complaint.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/complaint/my_complaint.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/complaint/my_complaint_write.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/complaint/my_complaint_write.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/home/my_home_strategy.vue" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_receive.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_receive.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.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/invitation/my_invitation_send.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/message/my_message_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/message/my_message_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/official_account/my_official_account.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/official_account/my_official_account.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/order/my_order.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/order/my_order.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/TeacherCertifications.java" beforeDir="false" afterPath="$PROJECT_DIR$/service/service-education/src/main/java/com/xunwang/education/entity/TeacherCertifications.java" 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$/../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/share/my_share.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result_order.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result_order.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result_order_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/share/my_share_result_order_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/suggestion/my_suggestion.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/suggestion/my_suggestion.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/my/suggestion/my_suggestion_write.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/suggestion/my_suggestion_write.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/user/my_user_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/user/my_user_detail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/my/user/my_user_login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/my/user/my_user_login.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_add.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_add.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_collect.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_my_collect.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/student/require/student_require_my_publish.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/student/require/student_require_my_publish.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication_add.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication_add.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication_detail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/authentication/teacher_authentication_detail.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_add.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_add.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_collect.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_my_collect.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$/../education_uni/subpkg/teacher/course/teacher_course_my_publish.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/subpkg/teacher/course/teacher_course_my_publish.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../education_uni/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../education_uni/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -134,11 +70,11 @@
     &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;Modules&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&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;,
-    &quot;spring.configuration.checksum&quot;: &quot;0b7b4537507353d4a1822abd918fca9b&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
+    &quot;spring.configuration.checksum&quot;: &quot;fe88420ca20309a5f7cd49498b6d195f&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
@@ -173,7 +109,20 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.ServiceUcApplication">
+  <component name="RunManager" selected="Application.FileUpload">
+    <configuration name="FileUpload" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.xunwang.file.controller.FileUpload" />
+      <module name="service-file" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.xunwang.file.controller.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="RandomNameUtils" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.xunwang.servicebase.utils.RandomNameUtils" />
       <module name="service_base" />
@@ -252,6 +201,7 @@
       </method>
     </configuration>
     <list>
+      <item itemvalue="Application.FileUpload" />
       <item itemvalue="Application.RandomNameUtils" />
       <item itemvalue="Application.test" />
       <item itemvalue="JUnit.CodeGenerator.run" />
@@ -263,6 +213,7 @@
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="Application.FileUpload" />
         <item itemvalue="Application.RandomNameUtils" />
         <item itemvalue="Application.test" />
         <item itemvalue="JUnit.CodeGenerator.run" />
@@ -352,6 +303,16 @@
       <workItem from="1685065691162" duration="3513000" />
       <workItem from="1685241160460" duration="1293000" />
       <workItem from="1685256298185" duration="26000" />
+      <workItem from="1685325319014" duration="11000" />
+      <workItem from="1685325926633" duration="2919000" />
+      <workItem from="1685455134055" duration="712000" />
+      <workItem from="1685519573898" duration="18000" />
+      <workItem from="1685615004975" duration="2014000" />
+      <workItem from="1685854703452" duration="139000" />
+      <workItem from="1685947946603" duration="1305000" />
+      <workItem from="1686035415803" duration="14000" />
+      <workItem from="1686035518397" duration="1770000" />
+      <workItem from="1686037499513" duration="54000" />
     </task>
     <servers />
   </component>

education_family/common/service_base/pom.xml

@@ -17,9 +17,5 @@
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
     </dependencies>
 </project>

education_family/infrastructure/api_gateway/pom.xml

@@ -13,11 +13,6 @@
     <description>网关微服务</description>
 
     <dependencies>
-        <dependency>
-            <groupId>com.xunwang</groupId>
-            <artifactId>common_utils</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
@@ -31,11 +26,17 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-        <!--服务调用-->
+<!--        服务调用-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.xunwang</groupId>
+            <artifactId>service_base</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

education_family/infrastructure/api_gateway/src/main/java/com/xunwang/gateway/filter/AuthGlobalFilter.java

@@ -1,7 +1,7 @@
 package com.xunwang.gateway.filter;
 
 import com.google.gson.JsonObject;
-import com.xunwang.commonutils.JwtUtils;
+import com.xunwang.servicebase.utils.JwtUtils;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.core.Ordered;

education_family/service/service-education/pom.xml

@@ -18,7 +18,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

education_family/service/service-education/src/main/java/com/xunwang/education/entity/TeacherCertifications.java

@@ -65,6 +65,8 @@ public class TeacherCertifications implements Serializable {
     @ApiModelProperty(value = "头像照片存放路径")
     private String profilePhoto;
 
+    private String graduatemonth;
+
     @ApiModelProperty(value = "高校全名")
     private String school;
 

education_family/service/service-file/src/main/java/com/xunwang/file/controller/FileUpload.java

@@ -4,10 +4,9 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.xunwang.servicebase.utils.R;
 import com.xunwang.file.util.MinioUtil;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
@@ -26,4 +25,5 @@ public class FileUpload {
         String upload = minioUtil.upload(file);
         return R.ok().data("url", upload);
     }
+
 }

education_uni/subpkg/my/order/my_order_detail.vue

@@ -100,7 +100,6 @@
 		},
 		onLoad(option) {
 			if (option.orderId !== undefined) {
-				this.getOne(option.orderId)
 				this.getCountDown(option.orderId)
 			}
 		},
@@ -155,12 +154,13 @@
 			async getOne(id) {
 				const {data: result} = await uni.$http.get('/payment/order-info/getOrderInfoByOrderId', {orderId: id})
 				this.info = result.data.one
+				
 				// 判断支付状态
 				if (this.info.status !== '未支付') {
 					this.countDown = false
 					this.pay = true
 				} 
-				if (this.info.status === '未支付' && this.time == -2){
+				if (this.info.status === '未支付' && this.time === -2){
 					this.disabled = true
 					this.info.status = '已超时'
 				}
@@ -182,7 +182,8 @@
 				if (this.time != -2) {
 					this.minute = this.time / 60
 					this.second = this.time % 60
-				} 
+				}
+				this.getOne(id)
 			},
 			// 支付
 			async paymentButton() {

education_uni/subpkg/student/require/student_require_all_detail.vue

@@ -101,7 +101,9 @@
 			},
 			async showMyCourse() {
 				const { data: result } = await uni.$http.get('/education/teacher-courses/queryPersonSomeInfo')
-				this.myCourses = result.data.list
+				if (this.userinfo.uid !== this.item.uid) {
+					this.myCourses = result.data.list
+				}
 				const name = result.data.name
 				if (this.myCourses !== undefined) {
 					for (let i = 0; i < this.myCourses.length; i++) {

education_uni/subpkg/teacher/course/teacher_course_add.vue

@@ -283,6 +283,10 @@
 			...mapMutations('m_user', ['updateAuthentication']),
 			// 格式化传递过来的course信息
 			formatCourse(item) {
+				const arr = item.subject.split("/")
+				this.baseFormData.subject = arr[1]
+				this.baseFormData.subjectBig = arr[0]
+				
 				this.baseFormData.mode = item.mode
 				this.baseFormData.teachAge = item.teachAge
 				this.baseFormData.location = item.location

education_uni/subpkg/teacher/course/teacher_course_all_detail.vue

@@ -111,7 +111,9 @@
 			},
 			async showMyStuNeeds() {
 				const { data: result } = await uni.$http.get('/education/student-requirements/queryPersonSomeInfo')
-				this.myNeeds = result.data.list
+				if (this.userinfo.uid !== this.course.uid) {
+					this.myNeeds = result.data.list
+				}
 			},
 			invite() {
 				this.isShowInvite = true