From ad3d2838816eeed4b66b2d08a8ef0bb902babc70 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@cronie>
Date: Fri, 16 Nov 2018 10:32:42 +0800
Subject: [PATCH] mengyu

---
 MengYu-Trade/pom.xml                          | 142 ++++++++++++++++++
 .../java/com/cronie/MengYuApplication.java    |   4 +-
 .../src/main/resources/application.yml        |   2 +-
 3 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 MengYu-Trade/pom.xml

diff --git a/MengYu-Trade/pom.xml b/MengYu-Trade/pom.xml
new file mode 100644
index 000000000..3e5972e8f
--- /dev/null
+++ b/MengYu-Trade/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>3.0</version>
+  </parent>
+  <groupId>com.cronie</groupId>
+  <artifactId>mengyu-trade</artifactId>
+  <packaging>jar</packaging>
+  <version>3.0</version>
+  <name>mengyu-trade</name>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <dependencies>
+   <!-- spring-boot-devtools -->
+  	<dependency>
+  		<groupId>com.ruoyi</groupId>
+  		<artifactId>ruoyi-framework</artifactId>
+  		<version>3.0</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>com.ruoyi</groupId>
+  		<artifactId>ruoyi-admin</artifactId>
+  		<version>3.0</version>
+  	</dependency>
+  	
+  	
+  </dependencies>
+  
+   <build>
+    
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArguments>
+                        <verbose/>
+                        <bootclasspath>${java.home}\lib\rt.jar;${java.home}\lib\jce.jar</bootclasspath>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/lib
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeScope>system</includeScope>
+                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>com.cronie.MengYuApplication</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>./</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <excludes>
+                        <exclude>mapper/**</exclude>
+                        <exclude>application.yml</exclude>
+                        <exclude>*.properties</exclude>
+                        <exclude>public/**</exclude>
+                        <exclude>static/**</exclude>
+                        <exclude>templates/**</exclude>
+                        <exclude>library/**</exclude>
+                        <exclude>freemaker.properties</exclude>
+                        <exclude>logback-spring.xml</exclude>
+                        <exclude>*.jar</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.4</version>
+                <configuration>
+                    <appendAssemblyId>true</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/build/package.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>
diff --git a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
index f036adc3d..989fd671b 100644
--- a/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
+++ b/MengYu-Trade/src/main/java/com/cronie/MengYuApplication.java
@@ -4,6 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
 
 
@@ -13,7 +14,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author cronie
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-@MapperScan({"com.ruoyi.*.mapper","com.cronie.*.mapper"})
+@MapperScan(basePackages={"com.ruoyi.*.mapper","com.cronie.*.mapper"})
+@ComponentScan({"com.cronie.mengyu.*","com.ruoyi.*"})
 public class MengYuApplication
 {
     public static void main(String[] args)
diff --git a/MengYu-Trade/src/main/resources/application.yml b/MengYu-Trade/src/main/resources/application.yml
index bb27a23fb..c96aaba79 100644
--- a/MengYu-Trade/src/main/resources/application.yml
+++ b/MengYu-Trade/src/main/resources/application.yml
@@ -70,7 +70,7 @@ spring:
 # MyBatis
 mybatis:
     # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi
+    typeAliasesPackage: com.ruoyi,com.cronie.mengyu
     # 配置mapper的扫描，找到所有的mapper.xml映射文件
     mapperLocations: classpath*:mapper/**/*Mapper.xml
     # 加载全局的配置文件