From f9a344633ef195d11ce63c544a673c6ba3db7522 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 9 Jun 2021 14:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4auth-client=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet-auth-client => epmet-auth-client}/pom.xml       | 2 +-
 .../com/epmet/auth/constants/AuthOperationConstants.java  | 0
 .../java/com/epmet/auth/constants/AuthOperationEnum.java  | 0
 epmet-auth/pom.xml                                        | 3 ---
 epmet-gateway/pom.xml                                     | 8 ++++----
 pom.xml                                                   | 1 +
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename {epmet-auth/epmet-auth-client => epmet-auth-client}/pom.xml (89%)
 rename {epmet-auth/epmet-auth-client => epmet-auth-client}/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java (100%)
 rename {epmet-auth/epmet-auth-client => epmet-auth-client}/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java (100%)

diff --git a/epmet-auth/epmet-auth-client/pom.xml b/epmet-auth-client/pom.xml
similarity index 89%
rename from epmet-auth/epmet-auth-client/pom.xml
rename to epmet-auth-client/pom.xml
index 685407f474..1aee53c24e 100644
--- a/epmet-auth/epmet-auth-client/pom.xml
+++ b/epmet-auth-client/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>epmet-auth</artifactId>
+        <artifactId>epmet-cloud</artifactId>
         <groupId>com.epmet</groupId>
         <version>2.0.0</version>
     </parent>
diff --git a/epmet-auth/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java
similarity index 100%
rename from epmet-auth/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java
rename to epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationConstants.java
diff --git a/epmet-auth/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java b/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java
similarity index 100%
rename from epmet-auth/epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java
rename to epmet-auth-client/src/main/java/com/epmet/auth/constants/AuthOperationEnum.java
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 6970ec1dd8..87300fc380 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -3,9 +3,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <version>0.3.70</version>
-    <modules>
-        <module>epmet-auth-client</module>
-    </modules>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 2a41a386b0..dc2dd76fda 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -255,11 +255,11 @@
                 <nacos.ip></nacos.ip>
                 <!-- gateway routes -->
                 <!--  1、认证服务  -->
-                 <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>
-                <!--<gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
+                <!-- <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>-->
+                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
                 <!--  2、Admin服务  -->
-                <gateway.routes.epmet-admin-server.uri>http://localhost:8082</gateway.routes.epmet-admin-server.uri>
-                <!--<gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>-->
+                <!--<gateway.routes.epmet-admin-server.uri>http://localhost:8082</gateway.routes.epmet-admin-server.uri>-->
+                <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
                 <!--  4、OSS服务 -->
                 <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
                 <!--  5、消息服务  -->
diff --git a/pom.xml b/pom.xml
index 9b61cacf07..32fdd9b549 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
 		<module>epmet-commons</module>
 		<module>epmet-gateway</module>
 		<module>epmet-auth</module>
+		<module>epmet-auth-client</module>
 		<module>epmet-admin</module>
 		<module>epmet-module</module>
 		<module>epmet-user</module>