Merge remote-tracking branch 'cloud-schoolapi/ywx'

sapi/src/main/java/com/xhkjedu/sapi/interceptors/WebMvcConfg.java

     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowCredentials(true)
                 .allowedMethods("GET","POST")
                 .maxAge(3600);

sclass/pom.xml

         <!--    <groupId>org.springframework.cloud</groupId>-->
         <!--    <artifactId>spring-cloud-starter-config</artifactId>-->
         <!--</dependency>-->
-        <!--<dependency>-->
-        <!--    <groupId>org.springframework.cloud</groupId>-->
-        <!--    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>mysql</groupId>

sclass/src/main/java/com/xhkjedu/sclass/SclassApplication.java

 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
 @MapperScan("com.xhkjedu.sclass.mapper")
+@EnableEurekaClient
 public class SclassApplication {
 
     public static void main(String[] args) {

sclass/src/main/java/com/xhkjedu/sclass/interceptors/WebMvcConfg.java

     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowCredentials(true)
                 .allowedMethods("GET","POST")
                 .maxAge(3600);

slive/pom.xml

         <!--    <groupId>org.springframework.cloud</groupId>-->
         <!--    <artifactId>spring-cloud-starter-config</artifactId>-->
         <!--</dependency>-->
-        <!--<dependency>-->
-        <!--    <groupId>org.springframework.cloud</groupId>-->
-        <!--    <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>mysql</groupId>

slive/src/main/java/com/xhkjedu/slive/SliveApplication.java

 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
 @MapperScan("com.xhkjedu.slive.mapper")
+@EnableEurekaClient
 public class SliveApplication {
 
     public static void main(String[] args) {

slive/src/main/java/com/xhkjedu/slive/interceptors/WebMvcConfg.java

     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowCredentials(true)
                 .allowedMethods("GET","POST")
                 .maxAge(3600);

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/WebMvcConfg.java

     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowCredentials(true)
                 .allowedMethods("GET","POST")
                 .maxAge(3600);

suser/pom.xml

         <!--    <groupId>org.springframework.cloud</groupId>-->
         <!--    <artifactId>spring-cloud-starter-config</artifactId>-->
         <!--</dependency>-->
-
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--mybatis通用mapper依赖-->
-        <!--<dependency>-->
-        <!--    <groupId>tk.mybatis</groupId>-->
-        <!--    <artifactId>mapper-spring-boot-starter</artifactId>-->
-        <!--    <version>2.1.5</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>com.xhkjedu</groupId>
             <artifactId>scommons</artifactId>

suser/src/main/java/com/xhkjedu/suser/SuserApplication.java

 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
 @MapperScan("com.xhkjedu.suser.mapper")
+@EnableEurekaClient
 public class SuserApplication {
 
     public static void main(String[] args) {

suser/src/main/java/com/xhkjedu/suser/interceptors/WebMvcConfg.java

     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**")
-                .allowedOrigins("*")
+                .allowedOriginPatterns("*")
                 .allowCredentials(true)
                 .allowedMethods("GET","POST")
                 .maxAge(3600);