陶汉栋 / MyCloud

Download as
Browse Code »

Commit 2382f6c5bc0b5184bc628cfc157023deac4dc7e2

Authored by 陈杰
1 parent 440ab2e4
Exists in master and in 1 other branch cloud_copy

打包问题解决

Showing 11 changed files with 36 additions and 37 deletions   Show diff stats
cloud/common/pom.xml
  Diff comments   View file @2382f6c
@@ -9,8 +9,10 @@ @@ -9,8 +9,10 @@
9 </parent> 9 </parent>
10 <groupId>com.sincere</groupId> 10 <groupId>com.sincere</groupId>
11 <artifactId>common</artifactId> 11 <artifactId>common</artifactId>
12 - <version>0.0.1-SNAPSHOT</version> 12 + <version>1.0.0</version>
13 <name>common</name> 13 <name>common</name>
  14 +
  15 + <packaging>jar</packaging>
14 <description>Demo project for Spring Boot</description> 16 <description>Demo project for Spring Boot</description>
15 17
16 <properties> 18 <properties>
@@ -88,6 +90,9 @@ @@ -88,6 +90,9 @@
88 <plugin> 90 <plugin>
89 <groupId>org.springframework.boot</groupId> 91 <groupId>org.springframework.boot</groupId>
90 <artifactId>spring-boot-maven-plugin</artifactId> 92 <artifactId>spring-boot-maven-plugin</artifactId>
  93 + <configuration>
  94 + <classifier>exec</classifier>
  95 + </configuration>
91 </plugin> 96 </plugin>
92 </plugins> 97 </plugins>
93 </build> 98 </build>
cloud/common/src/main/java/com/sincere/common/util/RedisUtils.java
  Diff comments   View file @2382f6c
@@ -86,9 +86,6 @@ public class RedisUtils { @@ -86,9 +86,6 @@ public class RedisUtils {
86 } 86 }
87 } 87 }
88 88
89 - public static void main(String[] args) {  
90 - RedisUtils.setString("test","test");  
91 - }  
92 /** 89 /**
93 * 释放jedis资源 90 * 释放jedis资源
94 * @param jedis 91 * @param jedis
cloud/common/src/test/java/com/sincere/common/CommonApplicationTests.java
View file @440ab2e
@@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
1 -package com.sincere.common;  
2 -  
3 -import org.junit.Test;  
4 -import org.junit.runner.RunWith;  
5 -import org.springframework.boot.test.context.SpringBootTest;  
6 -import org.springframework.test.context.junit4.SpringRunner;  
7 -  
8 -@RunWith(SpringRunner.class)  
9 -@SpringBootTest  
10 -public class CommonApplicationTests {  
11 -  
12 - @Test  
13 - public void contextLoads() {  
14 - }  
15 -  
16 -}  
cloud/independence/pom.xml
  Diff comments   View file @2382f6c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <dependency> 15 <dependency>
16 <groupId>com.sincere</groupId> 16 <groupId>com.sincere</groupId>
17 <artifactId>common</artifactId> 17 <artifactId>common</artifactId>
18 - <version>0.0.1-SNAPSHOT</version> 18 + <version>1.0.0</version>
19 </dependency> 19 </dependency>
20 <dependency> 20 <dependency>
21 <groupId>com.googlecode.rapid-framework</groupId> 21 <groupId>com.googlecode.rapid-framework</groupId>
@@ -17,19 +17,20 @@ @@ -17,19 +17,20 @@
17 <modules> 17 <modules>
18 <module>server1</module> 18 <module>server1</module>
19 <module>server2</module> 19 <module>server2</module>
20 - <module>autho</module> 20 +<!-- <module>autho</module>-->
21 <module>common</module> 21 <module>common</module>
22 - <module>geteway</module>  
23 - <module>haikang</module>  
24 - <module>dahua</module>  
25 - <module>consumer</module>  
26 - <module>haikangface</module> 22 +<!-- <module>geteway</module>-->
  23 +<!-- <module>haikang</module>-->
  24 +<!-- <module>dahua</module>-->
  25 +<!-- <module>consumer</module>-->
  26 +<!-- <module>haikangface</module>-->
27 <module>search_independence</module> 27 <module>search_independence</module>
28 <module>search_smartCampus</module> 28 <module>search_smartCampus</module>
29 <module>search_xiaoan</module> 29 <module>search_xiaoan</module>
30 - <module>mypulsar</module> 30 +<!-- <module>mypulsar</module>-->
31 <module>weigeng</module> 31 <module>weigeng</module>
32 <module>independence</module> 32 <module>independence</module>
  33 +<!-- <module>test</module>-->
33 </modules> 34 </modules>
34 35
35 <properties> 36 <properties>
@@ -79,4 +80,21 @@ @@ -79,4 +80,21 @@
79 </dependency> 80 </dependency>
80 </dependencies> 81 </dependencies>
81 </dependencyManagement> 82 </dependencyManagement>
  83 +
  84 + <build>
  85 + <plugins>
  86 + <plugin>
  87 + <groupId>org.springframework.boot</groupId>
  88 + <artifactId>spring-boot-maven-plugin</artifactId>
  89 + <executions>
  90 + <execution>
  91 + <goals>
  92 + <goal>repackage</goal>
  93 + </goals>
  94 + </execution>
  95 + </executions>
  96 + </plugin>
  97 + </plugins>
  98 + </build>
  99 +
82 </project> 100 </project>
cloud/search_independence/pom.xml
  Diff comments   View file @2382f6c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <dependency> 15 <dependency>
16 <groupId>com.sincere</groupId> 16 <groupId>com.sincere</groupId>
17 <artifactId>common</artifactId> 17 <artifactId>common</artifactId>
18 - <version>0.0.1-SNAPSHOT</version> 18 + <version>1.0.0</version>
19 </dependency> 19 </dependency>
20 <dependency> 20 <dependency>
21 <groupId>org.apache.httpcomponents</groupId> 21 <groupId>org.apache.httpcomponents</groupId>
cloud/search_independence/src/main/java/com/sincere/independence/controller/LearnController.java
  Diff comments   View file @2382f6c
1 package com.sincere.independence.controller; 1 package com.sincere.independence.controller;
2 2
3 import com.sincere.common.dto.independence.*; 3 import com.sincere.common.dto.independence.*;
4 -import com.sincere.common.util.RedisUtils;  
5 import com.sincere.common.vo.BaseVo; 4 import com.sincere.common.vo.BaseVo;
6 import com.sincere.independence.model.*; 5 import com.sincere.independence.model.*;
7 import com.sincere.independence.service.*; 6 import com.sincere.independence.service.*;
cloud/search_smartCampus/pom.xml
  Diff comments   View file @2382f6c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <dependency> 15 <dependency>
16 <groupId>com.sincere</groupId> 16 <groupId>com.sincere</groupId>
17 <artifactId>common</artifactId> 17 <artifactId>common</artifactId>
18 - <version>0.0.1-SNAPSHOT</version> 18 + <version>1.0.0</version>
19 </dependency> 19 </dependency>
20 <dependency> 20 <dependency>
21 <groupId>io.netty</groupId> 21 <groupId>io.netty</groupId>
cloud/search_xiaoan/pom.xml
  Diff comments   View file @2382f6c
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <dependency> 14 <dependency>
15 <groupId>com.sincere</groupId> 15 <groupId>com.sincere</groupId>
16 <artifactId>common</artifactId> 16 <artifactId>common</artifactId>
17 - <version>0.0.1-SNAPSHOT</version> 17 + <version>1.0.0</version>
18 </dependency> 18 </dependency>
19 <!-- https://mvnrepository.com/artifact/io.netty/netty-all --> 19 <!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
20 <dependency> 20 <dependency>
cloud/weigeng/pom.xml
  Diff comments   View file @2382f6c
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <dependency> 22 <dependency>
23 <groupId>com.sincere</groupId> 23 <groupId>com.sincere</groupId>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 - <version>0.0.1-SNAPSHOT</version> 25 + <version>1.0.0</version>
26 </dependency> 26 </dependency>
27 <dependency> 27 <dependency>
28 <groupId>org.apache.mina</groupId> 28 <groupId>org.apache.mina</groupId>
cloud/weigeng/src/main/java/com/sincere/weigeng/WeigengApplication.java
  Diff comments   View file @2382f6c
@@ -10,12 +10,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @@ -10,12 +10,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
10 @SpringBootApplication 10 @SpringBootApplication
11 public class WeigengApplication { 11 public class WeigengApplication {
12 12
13 - private static String ip = "172.16.3.175";  
14 - private static int port = 1200;  
15 -  
16 public static void main(String[] args) { 13 public static void main(String[] args) {
17 SpringApplication.run(WeigengApplication.class, args); 14 SpringApplication.run(WeigengApplication.class, args);
18 - //WatchServer.WatchingServerRunning(ip,port);  
19 } 15 }
20 16
21 } 17 }