Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cneeds-server
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangzr
cneeds-server
Commits
ac0a8a52
Commit
ac0a8a52
authored
Jan 08, 2020
by
zzrdark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.修改不需要web服务
2.增加一个logupload
parent
e70cb082
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
161 additions
and
99 deletions
+161
-99
compiler.xml
.idea/compiler.xml
+5
-1
encodings.xml
.idea/encodings.xml
+3
-1
workspace.xml
.idea/workspace.xml
+49
-3
pom.xml
cneeds-server-advice_control/pom.xml
+3
-17
AdviceControlApplication.java
...needs/server/advice/control/AdviceControlApplication.java
+3
-1
pom.xml
cneeds-server-datashow/pom.xml
+22
-0
DatashowApplication.java
...in/java/com/mx/cneeds/server/web/DatashowApplication.java
+19
-0
pom.xml
cneeds-server-device/pom.xml
+1
-18
DeviceApplication.java
...n/java/com/mx/cneeds/server/device/DeviceApplication.java
+3
-1
pom.xml
cneeds-server-device_activate/pom.xml
+1
-18
DeviceActiveApplication.java
...needs/server/device/activate/DeviceActiveApplication.java
+3
-1
pom.xml
cneeds-server-eureka/pom.xml
+6
-20
pom.xml
cneeds-server-logupload/pom.xml
+16
-0
pom.xml
cneeds-server-user/pom.xml
+3
-17
UserServerApplication.java
...java/com/mx/cneeds/server/user/UserServerApplication.java
+3
-1
pom.xml
pom.xml
+21
-0
No files found.
.idea/compiler.xml
View file @
ac0a8a52
...
@@ -7,9 +7,11 @@
...
@@ -7,9 +7,11 @@
<sourceTestOutputDir
name=
"target/generated-test-sources/test-annotations"
/>
<sourceTestOutputDir
name=
"target/generated-test-sources/test-annotations"
/>
<outputRelativeToContentRoot
value=
"true"
/>
<outputRelativeToContentRoot
value=
"true"
/>
<module
name=
"cneeds-server-advice_control"
/>
<module
name=
"cneeds-server-advice_control"
/>
<module
name=
"cneeds-server-datashow"
/>
<module
name=
"cneeds-server-logupload"
/>
<module
name=
"cneeds-server-device_activate"
/>
<module
name=
"cneeds-server-device_activate"
/>
<module
name=
"cneeds-server-device"
/>
<module
name=
"cneeds-server-user"
/>
<module
name=
"cneeds-server-user"
/>
<module
name=
"cneeds-server-device"
/>
</profile>
</profile>
</annotationProcessing>
</annotationProcessing>
<bytecodeTargetLevel>
<bytecodeTargetLevel>
...
@@ -19,9 +21,11 @@
...
@@ -19,9 +21,11 @@
<component
name=
"JavacSettings"
>
<component
name=
"JavacSettings"
>
<option
name=
"ADDITIONAL_OPTIONS_OVERRIDE"
>
<option
name=
"ADDITIONAL_OPTIONS_OVERRIDE"
>
<module
name=
"cneeds-server-advice_control"
options=
"-parameters"
/>
<module
name=
"cneeds-server-advice_control"
options=
"-parameters"
/>
<module
name=
"cneeds-server-datashow"
options=
"-parameters"
/>
<module
name=
"cneeds-server-device"
options=
"-parameters"
/>
<module
name=
"cneeds-server-device"
options=
"-parameters"
/>
<module
name=
"cneeds-server-device_activate"
options=
"-parameters"
/>
<module
name=
"cneeds-server-device_activate"
options=
"-parameters"
/>
<module
name=
"cneeds-server-eureka"
options=
"-parameters"
/>
<module
name=
"cneeds-server-eureka"
options=
"-parameters"
/>
<module
name=
"cneeds-server-logupload"
options=
"-parameters"
/>
<module
name=
"cneeds-server-user"
options=
"-parameters"
/>
<module
name=
"cneeds-server-user"
options=
"-parameters"
/>
</option>
</option>
</component>
</component>
...
...
.idea/encodings.xml
View file @
ac0a8a52
...
@@ -3,10 +3,11 @@
...
@@ -3,10 +3,11 @@
<component
name=
"Encoding"
>
<component
name=
"Encoding"
>
<file
url=
"file://$PROJECT_DIR$"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-advice_control"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-advice_control"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-
advice_control
"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-
datashow
"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-device"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-device"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-device_activate"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-device_activate"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-eureka"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-eureka"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-logupload"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-user"
charset=
"UTF-8"
/>
<file
url=
"file://$PROJECT_DIR$/cneeds-server-user"
charset=
"UTF-8"
/>
</component>
</component>
</project>
</project>
\ No newline at end of file
.idea/workspace.xml
View file @
ac0a8a52
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"58efcb75-622d-40c1-b8e0-10cd2fb456b4"
name=
"Default Changelist"
comment=
""
/>
<list
default=
"true"
id=
"58efcb75-622d-40c1-b8e0-10cd2fb456b4"
name=
"Default Changelist"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/cneeds-server-datashow/pom.xml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/web/DatashowApplication.java"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/cneeds-server-logupload/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/compiler.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/compiler.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/encodings.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/encodings.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-advice_control/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-advice_control/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-device/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-device/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-device_activate/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-device_activate/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-eureka/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-eureka/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-user/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-user/pom.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/pom.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/pom.xml"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"SHOW_DIALOG"
value=
"false"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
<option
name=
"HIGHLIGHT_CONFLICTS"
value=
"true"
/>
...
@@ -25,6 +42,13 @@
...
@@ -25,6 +42,13 @@
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
<option
name=
"RECENT_GIT_ROOT_PATH"
value=
"$PROJECT_DIR$"
/>
<option
name=
"ROOT_SYNC"
value=
"DONT_SYNC"
/>
<option
name=
"ROOT_SYNC"
value=
"DONT_SYNC"
/>
</component>
</component>
<component
name=
"IgnoredFileRootStore"
>
<option
name=
"generatedRoots"
>
<set>
<option
value=
"E:\mx_project\cneeds-server\.idea"
/>
</set>
</option>
</component>
<component
name=
"MavenImportPreferences"
>
<component
name=
"MavenImportPreferences"
>
<option
name=
"generalSettings"
>
<option
name=
"generalSettings"
>
<MavenGeneralSettings>
<MavenGeneralSettings>
...
@@ -37,8 +61,11 @@
...
@@ -37,8 +61,11 @@
<option
name=
"version"
value=
"1"
/>
<option
name=
"version"
value=
"1"
/>
</component>
</component>
<component
name=
"ProjectId"
id=
"1W0mhATlGYnzo3nnDBX2HHsw9gy"
/>
<component
name=
"ProjectId"
id=
"1W0mhATlGYnzo3nnDBX2HHsw9gy"
/>
<component
name=
"ProjectLevelVcsManager"
settingsEditedManually=
"true"
/>
<component
name=
"ProjectLevelVcsManager"
settingsEditedManually=
"true"
>
<ConfirmationsSetting
value=
"2"
id=
"Add"
/>
</component>
<component
name=
"PropertiesComponent"
>
<component
name=
"PropertiesComponent"
>
<property
name=
"ASKED_ADD_EXTERNAL_FILES"
value=
"true"
/>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"aspect.path.notification.shown"
value=
"true"
/>
<property
name=
"aspect.path.notification.shown"
value=
"true"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$"
/>
...
@@ -109,11 +136,29 @@
...
@@ -109,11 +136,29 @@
<option
name=
"presentableId"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1578278610279
</updated>
<updated>
1578278610279
</updated>
<workItem
from=
"1578278611504"
duration=
"10082000"
/>
<workItem
from=
"1578278611504"
duration=
"10082000"
/>
<workItem
from=
"1578295009682"
duration=
"2919000"
/>
<workItem
from=
"1578295009682"
duration=
"4167000"
/>
<workItem
from=
"1578389632725"
duration=
"4443000"
/>
<workItem
from=
"1578448455421"
duration=
"2444000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<component
name=
"TypeScriptGeneratedFilesManager"
>
<option
name=
"version"
value=
"1"
/>
<option
name=
"version"
value=
"1"
/>
</component>
</component>
<component
name=
"Vcs.Log.Tabs.Properties"
>
<option
name=
"TAB_STATES"
>
<map>
<entry
key=
"MAIN"
>
<value>
<State>
<option
name=
"COLUMN_ORDER"
/>
</State>
</value>
</entry>
</map>
</option>
</component>
<component
name=
"VcsManagerConfiguration"
>
<option
name=
"ADD_EXTERNAL_FILES_SILENTLY"
value=
"true"
/>
</component>
</project>
</project>
\ No newline at end of file
cneeds-server-advice_control/pom.xml
View file @
ac0a8a52
...
@@ -11,12 +11,7 @@
...
@@ -11,12 +11,7 @@
<artifactId>
cneeds-server-advice_control
</artifactId>
<artifactId>
cneeds-server-advice_control
</artifactId>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
...
@@ -25,17 +20,7 @@
...
@@ -25,17 +20,7 @@
</dependency>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
\ No newline at end of file
cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java
View file @
ac0a8a52
package
com
.
mx
.
cneeds
.
server
.
advice
.
control
;
package
com
.
mx
.
cneeds
.
server
.
advice
.
control
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
/**
/**
...
@@ -15,6 +17,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
...
@@ -15,6 +17,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
@EnableEurekaClient
public
class
AdviceControlApplication
{
public
class
AdviceControlApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
AdviceControlApplication
.
clas
s
);
new
SpringApplicationBuilder
(
AdviceControlApplication
.
class
).
web
(
WebApplicationType
.
NONE
).
run
(
arg
s
);
}
}
}
}
cneeds-server-datashow/pom.xml
0 → 100644
View file @
ac0a8a52
<?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"
>
<parent>
<artifactId>
cneeds-server
</artifactId>
<groupId>
com.mx.cneeds
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cneeds-server-datashow
</artifactId>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/web/DatashowApplication.java
0 → 100644
View file @
ac0a8a52
package
com
.
mx
.
cneeds
.
server
.
web
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
/**
* @ClassName DatashowApplication
* @Author zzrdark
* @Date 2020-01-07 17:48
* @Description TODO
**/
@SpringBootApplication
@EnableEurekaClient
public
class
DatashowApplication
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
DatashowApplication
.
class
);
}
}
cneeds-server-device/pom.xml
View file @
ac0a8a52
...
@@ -11,28 +11,12 @@
...
@@ -11,28 +11,12 @@
<artifactId>
cneeds-server-device
</artifactId>
<artifactId>
cneeds-server-device
</artifactId>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
</dependency>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
\ No newline at end of file
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java
View file @
ac0a8a52
package
com
.
mx
.
cneeds
.
server
.
device
;
package
com
.
mx
.
cneeds
.
server
.
device
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
/**
/**
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
@EnableEurekaClient
public
class
DeviceApplication
{
public
class
DeviceApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
DeviceApplication
.
clas
s
);
new
SpringApplicationBuilder
(
DeviceApplication
.
class
).
web
(
WebApplicationType
.
NONE
).
run
(
arg
s
);
}
}
}
}
cneeds-server-device_activate/pom.xml
View file @
ac0a8a52
...
@@ -11,27 +11,11 @@
...
@@ -11,27 +11,11 @@
<artifactId>
cneeds-server.device_activate
</artifactId>
<artifactId>
cneeds-server.device_activate
</artifactId>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
</dependency>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
\ No newline at end of file
cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java
View file @
ac0a8a52
package
com
.
mx
.
cneeds
.
server
.
device
.
activate
;
package
com
.
mx
.
cneeds
.
server
.
device
.
activate
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
/**
/**
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
@EnableEurekaClient
public
class
DeviceActiveApplication
{
public
class
DeviceActiveApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
DeviceActiveApplication
.
clas
s
);
new
SpringApplicationBuilder
(
DeviceActiveApplication
.
class
).
web
(
WebApplicationType
.
NONE
).
run
(
arg
s
);
}
}
}
}
cneeds-server-eureka/pom.xml
View file @
ac0a8a52
...
@@ -12,12 +12,7 @@
...
@@ -12,12 +12,7 @@
<artifactId>
cneeds-server-eureka
</artifactId>
<artifactId>
cneeds-server-eureka
</artifactId>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
...
@@ -32,26 +27,16 @@
...
@@ -32,26 +27,16 @@
</dependency>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<!--<build>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugins>
<plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugin>
</plugins>
</plugins>
</build>
</build>
-->
</project>
</project>
\ No newline at end of file
cneeds-server-logupload/pom.xml
0 → 100644
View file @
ac0a8a52
<?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"
>
<parent>
<artifactId>
cneeds-server
</artifactId>
<groupId>
com.mx.cneeds
</groupId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
cneeds-server-logupload
</artifactId>
</project>
\ No newline at end of file
cneeds-server-user/pom.xml
View file @
ac0a8a52
...
@@ -11,27 +11,12 @@
...
@@ -11,27 +11,12 @@
<artifactId>
cneeds-server-user
</artifactId>
<artifactId>
cneeds-server-user
</artifactId>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
<artifactId>
spring-cloud-starter-netflix-eureka-client
</artifactId>
</dependency>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>
\ No newline at end of file
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java
View file @
ac0a8a52
package
com
.
mx
.
cneeds
.
server
.
user
;
package
com
.
mx
.
cneeds
.
server
.
user
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.WebApplicationType
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.boot.builder.SpringApplicationBuilder
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
/**
/**
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
...
@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
@EnableEurekaClient
public
class
UserServerApplication
{
public
class
UserServerApplication
{
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
UserServerApplication
.
clas
s
);
new
SpringApplicationBuilder
(
UserServerApplication
.
class
).
web
(
WebApplicationType
.
NONE
).
run
(
arg
s
);
}
}
}
}
pom.xml
View file @
ac0a8a52
...
@@ -19,8 +19,29 @@
...
@@ -19,8 +19,29 @@
<module>
cneeds-server-device
</module>
<module>
cneeds-server-device
</module>
<module>
cneeds-server-device_activate
</module>
<module>
cneeds-server-device_activate
</module>
<module>
cneeds-server-advice_control
</module>
<module>
cneeds-server-advice_control
</module>
<module>
cneeds-server-datashow
</module>
<module>
cneeds-server-logupload
</module>
</modules>
</modules>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<java.version>
1.8
</java.version>
<spring-cloud.version>
Finchley.SR2
</spring-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-dependencies
</artifactId>
<version>
${spring-cloud.version}
</version>
<type>
pom
</type>
<scope>
import
</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependencies>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment