Merge branch 'dev'

pig-auth/pom.xml

@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.github.pig</groupId>
-	<artifactId>pig-auth-service</artifactId>
+	<artifactId>pig-auth</artifactId>
 	<version>${pig.version}</version>
 	<packaging>jar</packaging>
 
-	<name>pig-auth-service</name>
+	<name>pig-auth</name>
 	<description>jwt 认证服务</description>
 
 	<parent>

pig-auth/src/main/java/com/github/pig/auth/feign/UserService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * @author lengleng
  * @date 2017/10/31
  */
-@FeignClient(name = "pig-admin-service", fallback = UserServiceFallbackImpl.class)
+@FeignClient(name = "pig-upms-service", fallback = UserServiceFallbackImpl.class)
 public interface UserService {
     /**
      * 通过用户名查询用户、角色信息

pig-auth/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: pig-auth-service
+    name: pig-auth
   profiles:
     active: dev
   cloud:

pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java

@@ -12,7 +12,7 @@ import java.util.Set;
  * @author lengleng
  * @date 2017/10/31
  */
-@FeignClient(name = "pig-admin-service", fallback = MenuServiceFallbackImpl.class)
+@FeignClient(name = "pig-upms-service", fallback = MenuServiceFallbackImpl.class)
 public interface MenuService {
     /**
      * 通过角色名查询菜单

pig-gateway/src/main/java/com/github/pig/gateway/feign/UserService.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable;
  * @author lengleng
  * @date 2017/10/31
  */
-@FeignClient(name = "pig-admin-service", fallback = UserServiceFallbackImpl.class)
+@FeignClient(name = "pig-upms-service", fallback = UserServiceFallbackImpl.class)
 public interface UserService {
     /**
      * 通过用户名查询用户、角色信息

pig-modules/pig-upms-service/pom.xml

@@ -4,16 +4,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.github.pig</groupId>
-	<artifactId>pig-admin-service</artifactId>
+	<artifactId>pig-upms-service</artifactId>
 	<version>${pig.version}</version>
 	<packaging>jar</packaging>
 
-	<name>pig-admin-service</name>
-	<description>pig-admin-service</description>
+	<name>pig-upms-service</name>
+	<description>pig-upms-service</description>
 
 	<parent>
-		<groupId>com.github</groupId>
-		<artifactId>pig</artifactId>
+		<groupId>com.github.pig</groupId>
+		<artifactId>pig-modules</artifactId>
 		<version>${pig.version}</version>
 	</parent>
 

pig-modules/pig-upms-service/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: pig-admin-service
+    name: pig-upms-service
   profiles:
     active: dev
   cloud:

pig-modules/pig-upms-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java

@@ -2,7 +2,6 @@ package com.github.pig.admin.controller;
 
 import com.github.pig.admin.dto.UserDto;
 import com.xiaoleilu.hutool.http.HttpUtil;
-import com.xiaoleilu.hutool.json.JSON;
 import com.xiaoleilu.hutool.json.JSONUtil;
 import org.apache.commons.collections.MapUtils;
 import org.junit.Before;

pig-modules/pom.xml

@@ -0,0 +1,26 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>pig</artifactId>
+        <groupId>com.github</groupId>
+        <version>${pig.version}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.github.pig</groupId>
+    <artifactId>pig-modules</artifactId>
+    <version>${pig.version}</version>
+    <packaging>pom</packaging>
+
+    <name>pig-modules</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <modules>
+        <module>pig-upms-service</module>
+    </modules>
+
+</project>

pom.xml

@@ -45,13 +45,13 @@
     </dependencies>
 
     <modules>
+        <module>pig-auth</module>
+        <module>pig-config</module>
         <module>pig-common</module>
         <module>pig-eureka</module>
-        <module>pig-config</module>
-        <module>pig-visual</module>
         <module>pig-gateway</module>
-        <module>pig-auth-service</module>
-        <module>pig-admin-service</module>
+        <module>pig-modules</module>
+        <module>pig-visual</module>
     </modules>
 
     <dependencyManagement>