Skip to content

C
cneeds-server
Commit ac0a8a52 by zzrdark
Options

1.修改不需要web服务 

2.增加一个logupload
parent e70cb082
Showing with 161 additions and 99 deletions
.idea/compiler.xml
......@@ -7,9 +7,11 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<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" />
<module name="cneeds-server-user" />
<module name="cneeds-server-device" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
......@@ -19,9 +21,11 @@
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<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_activate" options="-parameters" />
<module name="cneeds-server-eureka" options="-parameters" />
<module name="cneeds-server-logupload" options="-parameters" />
<module name="cneeds-server-user" options="-parameters" />
</option>
</component>
......
.idea/encodings.xml
......@@ -3,10 +3,11 @@
<component name="Encoding">
<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-datashow" 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-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" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -25,6 +42,13 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
<option value="E:\mx_project\cneeds-server\.idea" />
</set>
</option>
</component>
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
......@@ -37,8 +61,11 @@
<option name="version" value="1" />
</component>
<component name="ProjectId" id="1W0mhATlGYnzo3nnDBX2HHsw9gy" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
......@@ -109,11 +136,29 @@
<option name="presentableId" value="Default" />
<updated>1578278610279</updated>
<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>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</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>
\ No newline at end of file
cneeds-server-advice_control/pom.xml
......@@ -11,12 +11,7 @@
<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>
<dependency>
......@@ -25,17 +20,7 @@
</dependency>
</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>
\ No newline at end of file
cneeds-server-advice_control/src/main/java/com/mx/cneeds/server/advice/control/AdviceControlApplication.java
package com.mx.cneeds.server.advice.control;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
......@@ -15,6 +17,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
public class AdviceControlApplication {
public static void main(String[] args) {
SpringApplication.run(AdviceControlApplication.class);
new SpringApplicationBuilder(AdviceControlApplication.class).web(WebApplicationType.NONE).run(args);
}
}
cneeds-server-datashow/pom.xml 0 → 100644
<?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
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
......@@ -11,28 +11,12 @@
<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>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
</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>
\ No newline at end of file
cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java
package com.mx.cneeds.server.device;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
......@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
public class DeviceApplication {
public static void main(String[] args) {
SpringApplication.run(DeviceApplication.class);
new SpringApplicationBuilder(DeviceApplication.class).web(WebApplicationType.NONE).run(args);
}
}
cneeds-server-device_activate/pom.xml
......@@ -11,27 +11,11 @@
<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>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
</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>
\ No newline at end of file
cneeds-server-device_activate/src/main/java/com/mx/cneeds/server/device/activate/DeviceActiveApplication.java
package com.mx.cneeds.server.device.activate;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
......@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
public class DeviceActiveApplication {
public static void main(String[] args) {
SpringApplication.run(DeviceActiveApplication.class);
new SpringApplicationBuilder(DeviceActiveApplication.class).web(WebApplicationType.NONE).run(args);
}
}
cneeds-server-eureka/pom.xml
......@@ -12,12 +12,7 @@
<artifactId>cneeds-server-eureka</artifactId>
<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>
<dependency>
......@@ -32,26 +27,16 @@
</dependency>
</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>
<build>
<!--<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</build>-->
</project>
\ No newline at end of file
cneeds-server-logupload/pom.xml 0 → 100644
<?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
......@@ -11,27 +11,12 @@
<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>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
</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>
\ No newline at end of file
cneeds-server-user/src/main/java/com/mx/cneeds/server/user/UserServerApplication.java
package com.mx.cneeds.server.user;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
/**
......@@ -14,6 +16,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@EnableEurekaClient
public class UserServerApplication {
public static void main(String[] args) {
SpringApplication.run(UserServerApplication.class);
new SpringApplicationBuilder(UserServerApplication.class).web(WebApplicationType.NONE).run(args);
}
}
pom.xml
......@@ -19,8 +19,29 @@
<module>cneeds-server-device</module>
<module>cneeds-server-device_activate</module>
<module>cneeds-server-advice_control</module>
<module>cneeds-server-datashow</module>
<module>cneeds-server-logupload</module>
</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>
<dependency>
<groupId>org.springframework.boot</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment