Merge remote-tracking branch 'origin/master'

mec-thirdpart/pom.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>mec</artifactId>
+    <groupId>com.ym</groupId>
+    <version>1.0</version>
+  </parent>
+
+  <groupId>com.ym</groupId>
+  <artifactId>mec-thirdpart</artifactId>
+  <version>1.0</version>
+
+  <name>mec-thirdpart</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

mec-thirdpart/src/main/java/com/ym/App.java

@@ -0,0 +1,13 @@
+package com.ym;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

mec-thirdpart/src/test/java/com/ym/AppTest.java

@@ -0,0 +1,20 @@
+package com.ym;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/OrganizationController.java

@@ -23,7 +23,7 @@ public class OrganizationController extends BaseController {
     @ApiOperation(value = "分页查询组织机构树状列表")
     @PostMapping("/queryPage")
     public Object queryPage(@RequestBody OrganizationQueryInfo queryInfo){
-        return organizationService.queryTreePage(queryInfo);
+        return succeed(organizationService.queryTreePage(queryInfo));
     }
 
     @ApiOperation(value = "新增机构")

pom.xml

@@ -23,7 +23,7 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!--鏀�寔Spring Boot 2.1.X -->
+			<!--支持Spring Boot 2.1.X -->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
@@ -80,7 +80,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
 				<version>${zipkin.version}</version>
-				<!--鎺掗櫎log4j2 閬垮厤鍜宭ogback鍐茬獊璀﹀憡 -->
+				<!--排除log4j2 避免和logback冲突警告 -->
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework.boot</groupId>
@@ -95,14 +95,14 @@
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 浣跨敤娑堟伅鐨勬柟寮忔敹闆嗘暟鎹�紙浣跨敤rabbitmq锛� -->
+			<!-- 使用消息的方式收集数据（使用rabbitmq） -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-collector-rabbitmq</artifactId>
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 閲囩敤 elasticsearch 瀛樺偍鏁版嵁 -->
+			<!-- 采用 elasticsearch 存储数据 -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-storage-elasticsearch-http</artifactId>
@@ -205,12 +205,12 @@
 	</pluginRepositories>
 
 	<dependencies>
-		<!-- SpringBoot鏁村悎Web缁勪欢 -->
+		<!-- SpringBoot整合Web组件 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<!--鑷�渷鍜岀洃鎺х殑闆嗘垚鍔熻兘 -->
+		<!--自省和监控的集成功能 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -221,13 +221,13 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- SpringBoot鏁村悎config缁勪欢 -->
+		<!-- SpringBoot整合config组件 -->
 		<!-- <dependency> <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-hystrix</artifactId>
@@ -236,19 +236,19 @@
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> 
 			</dependency> -->
 
-		<!--闆嗙兢鐩戞帶娑堟伅闃熷垪 -->
+		<!--集群监控消息队列 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-hystrix-stream</artifactId> 
 			</dependency> -->
-		<!--鏃ュ織璺熻釜 -->
+		<!--日志跟踪 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-zipkin</artifactId> 
 			</dependency> -->
-		<!--娑堟伅鎬荤嚎 -->
+		<!--消息总线 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-bus-amqp</artifactId> 
 			</dependency> -->
-		<!--鐑�姞杞� -->
+		<!--热加载 -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
 			<scope>runtime</scope> <optional>true</optional> </dependency> -->
-		<!--娴嬭瘯妗嗘灦 -->
+		<!--测试框架 -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> 
 			<scope>test</scope> </dependency> -->
 		<dependency>
@@ -318,5 +318,6 @@
 		<module>mec-im</module>
 		<module>workflowy</module>
 	  <module>mec-workflow</module>
+    <module>mec-thirdpart</module>
   </modules>
 </project>