Merge branch 'zx_saas_qrLogin' of http://git.dayaedu.com/yonge/mec into test

audio-analysis/pom.xml

@@ -137,13 +137,18 @@
 			<version>4.1.68.Final</version>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.2.2</version>
+			</plugin>
 		</plugins>
 	</build>
 </project>

cms/pom.xml

@@ -79,7 +79,6 @@
 			<artifactId>dynamic-datasource</artifactId>
 		</dependency>
 	</dependencies>
-	
 	<build>
 		<plugins>
 			<plugin>

mec-eureka/pom.xml

@@ -42,7 +42,6 @@
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
-				<version>1.2.2</version>
 			</plugin>
 		</plugins>
 	</build>

mec-eureka/src/main/resources/bootstrap-dev.properties

@@ -1,4 +1,4 @@
-spring.cloud.nacos.config.server-addr=10.206.0.17:8848
+spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=470509f8-ea21-42cb-9c64-924c5ccc68ce
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-gateway/mec-gateway-web/src/main/java/com/ym/mec/gateway/web/filter/AuthFilter.java

@@ -1,6 +1,7 @@
 package com.ym.mec.gateway.web.filter;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.bouncycastle.util.IPAddress;
 import org.slf4j.Logger;
@@ -23,6 +24,12 @@ public class AuthFilter extends ZuulFilter {
 
 		RequestContext requestContext = RequestContext.getCurrentContext();
 		requestContext.getZuulRequestHeaders().put("HTTP_X_FORWARDED_FOR", getRealIp(requestContext.getRequest()));
+		HttpServletResponse response = requestContext.getResponse();
+		response.setHeader("Access-Control-Allow-Origin", "https://*.lexiaoya.cn");
+		response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+		response.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
+		response.setHeader("Access-Control-Allow-Credentials", "true");
+		response.setHeader("Access-Control-Max-Age", "3600");
 		return null;
 	}
 

pom.xml

@@ -22,6 +22,9 @@
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
+		<docker.host>http://127.0.0.1:2375</docker.host>
+		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
+		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -383,6 +386,37 @@
 						</execution>
 					</executions>
 				</plugin>
+<!--
+				<plugin>
+					<groupId>com.spotify</groupId>
+					<artifactId>docker-maven-plugin</artifactId>
+					<version>${docker.maven.plugin.version}</version>
+					<executions>
+						<execution>
+							<id>build-image</id>
+							<phase>package</phase>
+							<goals>
+								<goal>build</goal>
+								<goal>push</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<imageName>${docker.registry.repository}/${project.artifactId}:${project.version}</imageName>
+						<dockerHost>${docker.host}</dockerHost>
+						<baseImage>adoptopenjdk/openjdk8:latest</baseImage>
+						<entryPoint>["java", "-jar","-Dspring.profiles.active=dev","/${project.build.finalName}.jar"]
+						</entryPoint>
+						<resources>
+							<resource>
+								<targetPath>/</targetPath>
+								<directory>${project.build.directory}</directory>
+								<include>${project.build.finalName}.jar</include>
+							</resource>
+						</resources>
+					</configuration>
+				</plugin>
+-->
 			</plugins>
 		</pluginManagement>
 		<plugins>