Merge branch 'feature/0427-school' into master_saas

.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,30 @@
+GET http://127.0.0.1:8005/schoolActivity/detail/16
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-02T182950.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolActivity/detail/16
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-02T182849.200.json
+
+###
+
+GET http://127.0.0.1:8005/schoolActivity/detail/16
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-02T182844.200.json
+
+###
+
 GET http://127.0.0.1:8005/vipGroupManage/liveGroupDetail/96
 Authorization: bearer b897da27-5a37-47df-8e76-54d80a61a55d
 Connection: Keep-Alive
@@ -791,45 +818,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
-Content-Type: application/json
-Content-Length: 71
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"coopId":16,"phone":"19900990111","staffId":1837,"userType":"TEACHER"}
-
-<> 2023-05-30T145329.200.json
-
-###
-
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 6882e681-2f9a-4f8f-aee1-79b1e42de850
-Content-Type: application/json
-Content-Length: 71
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
-
-<> 2023-05-30T144905.200.json
-
-###
-
-POST http://127.0.0.1:8005/schoolStaff/updateAccount
-Authorization: bearer 9e3a8ca3-b369-485a-aae0-5cdf17d46e61
-Content-Type: application/json
-Content-Length: 71
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{"coopId":19,"phone":"19900990114","staffId":1837,"userType":"TEACHER"}
-
-<> 2023-05-30T144848.200.json
-
-###
-

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -43,7 +43,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
                         "/eduOrganization/queryAllOrgan","/eduOrganization/queryAll","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
-                        "/tenantInfo/callback","/adapay/callback","/temp/*", "/open/**"
+                        "/tenantInfo/callback","/adapay/callback","/temp/*", "/open/**","/schoolActivity/detail/*"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }