From d024dabd9808d5712939365bb89970dc5e4f804e Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 27 十二月 2021 13:43:51 +0800
Subject: [PATCH] 灯模块
---
/dev/null | 1
ximon-admin/src/test/java/com/sandu/ximon/admin/QuartzTests.java | 8 -
.run/测试-管理端.run.xml | 40 ++++++++
ximon-admin/pom.xml | 169 +++++++++++++++++----------------
ximon-admin/src/main/resources/application-dev.yml | 6
dao/pom.xml | 5 -
pom.xml | 15 --
7 files changed, 130 insertions(+), 114 deletions(-)
diff --git "a/.run/\346\265\213\350\257\225-\347\256\241\347\220\206\347\253\257.run.xml" "b/.run/\346\265\213\350\257\225-\347\256\241\347\220\206\347\253\257.run.xml"
new file mode 100644
index 0000000..17d96bd
--- /dev/null
+++ "b/.run/\346\265\213\350\257\225-\347\256\241\347\220\206\347\253\257.run.xml"
@@ -0,0 +1,40 @@
+<component name="ProjectRunConfigurationManager">
+ <configuration default="false" name="娴嬭瘯-绠＄悊绔�" type="DEPLOY_HOST_RUN_CONFIGURATION" factoryName="Deploy to Host">
+ <option name="accountModel" />
+ <option name="accountModels" />
+ <option name="address" />
+ <option name="afterCommand" value="cd /usr/local/project/ximon-light-20017 && sh ./run.sh restart" />
+ <option name="alreadyReset" value="true" />
+ <option name="autoOpen" value="false" />
+ <option name="beforeCommand" value="" />
+ <option name="defaultTabIdx" value="0" />
+ <option name="ecsInstance">
+ <EcsInstance>
+ <option name="OSType" />
+ <option name="instanceId" />
+ <option name="instanceName" />
+ <option name="netType" />
+ <option name="privateIps" />
+ <option name="publicIps" />
+ <option name="regionId" />
+ <option name="tags" />
+ </EcsInstance>
+ </option>
+ <option name="ecsInstances" />
+ <option name="hostIds">
+ <list>
+ <option value="1" />
+ </list>
+ </option>
+ <option name="hostTagId" value="0" />
+ <option name="location" value="cd /usr/local/project/ximon-light-20017" />
+ <option name="pathOrUrl" value="D:\project\sandu\ximon-light-management\ximon-admin\target\ximon-admin-0.0.1-SNAPSHOT.jar" />
+ <option name="tagId" value="0" />
+ <option name="terminalCommand" />
+ <option name="type" value="HOST" />
+ <option name="uploadType" value="FILE" />
+ <method v="2">
+ <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="clean package -Dmaven.test.skip=true" />
+ </method>
+ </configuration>
+</component>
\ No newline at end of file
diff --git a/dao/pom.xml b/dao/pom.xml
index 6f43e97..d8c4559 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -19,11 +19,6 @@
<groupId>com.sandu.ximon</groupId>
<artifactId>sandu-common</artifactId>
</dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.4.200</version>
- </dependency>
</dependencies>
</project>
diff --git a/dao/src/main/resources/application.properties b/dao/src/main/resources/application.properties
deleted file mode 100644
index 8b13789..0000000
--- a/dao/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/pom.xml b/pom.xml
index c66be61..83f46a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
<description>Demo project for Spring Boot</description>
<modules>
- <module>sandu-common</module>
<module>dao</module>
+ <module>sandu-common</module>
<module>ximon-admin</module>
</modules>
@@ -101,18 +101,7 @@
<build>
<plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclude>
- </excludes>
- </configuration>
- </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/ximon-admin/pom.xml b/ximon-admin/pom.xml
index dd2e6e8..7a6b81d 100644
--- a/ximon-admin/pom.xml
+++ b/ximon-admin/pom.xml
@@ -1,90 +1,91 @@
<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>com.sandu.ximon</groupId>
- <artifactId>management</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>admin</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>admin</name>
- <description>甯屾ⅵ绠＄悊鍚庡彴鎺ュ彛</description>
- <properties>
- <java.version>1.8</java.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.sandu.ximon</groupId>
- <artifactId>dao</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sandu.ximon</groupId>
- <artifactId>sandu-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-jms-client</artifactId>
- </dependency>
- <!-- util for base64-->
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>com.sandu.ximon</groupId>
+ <artifactId>management</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>ximon-admin</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>ximon-admin</name>
+ <description>甯屾ⅵ绠＄悊鍚庡彴鎺ュ彛</description>
+ <properties>
+ <java.version>1.8</java.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>com.sandu.ximon</groupId>
+ <artifactId>dao</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sandu.ximon</groupId>
+ <artifactId>sandu-common</artifactId>
+ </dependency>
+ <!--闃块噷浜戠墿鑱旂綉-->
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-jms-client</artifactId>
+ </dependency>
+ <!-- util for base64-->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.aliyun</groupId>
+ <artifactId>aliyun-java-sdk-iot</artifactId>
+ </dependency>
+ <!--闃块噷浜戠墿鑱旂綉 -->
+ </dependencies>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.aliyun</groupId>
- <artifactId>aliyun-java-sdk-iot</artifactId>
- </dependency>
- </dependencies>
+ <!-- Maven鎺у埗Spring Profile -->
+ <profiles>
+ <!--榛樿寮�鍚痙ev-->
+ <profile>
+ <id>dev</id>
+ <properties>
+ <profileActive>dev</profileActive>
+ </properties>
+ </profile>
+ <!--娴嬭瘯閰嶇疆-->
+ <profile>
+ <id>test</id>
+ <properties>
+ <profileActive>test</profileActive>
+ </properties>
+ </profile>
+ <!--娴嬭瘯閰嶇疆-->
+ <profile>
+ <id>docker</id>
+ <properties>
+ <profileActive>docker</profileActive>
+ </properties>
+ </profile>
+ <!--鐢熶骇閰嶇疆-->
+ <profile>
+ <id>prod</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <profileActive>prod</profileActive>
+ </properties>
+ </profile>
+ </profiles>
- <!-- Maven鎺у埗Spring Profile -->
- <profiles>
- <!--榛樿寮�鍚痙ev-->
- <profile>
- <id>dev</id>
- <properties>
- <profileActive>dev</profileActive>
- </properties>
- </profile>
- <!--娴嬭瘯閰嶇疆-->
- <profile>
- <id>test</id>
- <properties>
- <profileActive>test</profileActive>
- </properties>
- </profile>
- <!--娴嬭瘯閰嶇疆-->
- <profile>
- <id>docker</id>
- <properties>
- <profileActive>docker</profileActive>
- </properties>
- </profile>
- <!--鐢熶骇閰嶇疆-->
- <profile>
- <id>prod</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <profileActive>prod</profileActive>
- </properties>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/ximon-admin/src/main/resources/application-dev.yml b/ximon-admin/src/main/resources/application-dev.yml
index 3d78766..a415311 100644
--- a/ximon-admin/src/main/resources/application-dev.yml
+++ b/ximon-admin/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@
password: chenjiantian1992 # Redis鏈嶅姟鍣ㄨ繛鎺ュ瘑鐮侊紙榛樿涓虹┖锛�
timeout: 300ms # 杩炴帴瓒呮椂鏃堕棿锛堟绉掞級
server:
- port: 8080
+ port: 20017
sandu:
jwt:
header: Authorization
@@ -29,10 +29,10 @@
# 鏄惁鍚姩redis缂撳瓨鐢ㄦ埛淇℃伅
cache-online: false
upload:
- upload-root-path: D:\usr\local\
+ upload-root-path: /usr/local/project/ximon-light-20017/file/
storage: local
common:
- urlPrefix: http://localhost:8080/file/
+ urlPrefix: http://112.74.63.130/file/
quartz:
enable: true
diff --git a/ximon-admin/src/test/java/com/sandu/ximon/admin/QuartzTests.java b/ximon-admin/src/test/java/com/sandu/ximon/admin/QuartzTests.java
index 4e69bdb..8c20e69 100644
--- a/ximon-admin/src/test/java/com/sandu/ximon/admin/QuartzTests.java
+++ b/ximon-admin/src/test/java/com/sandu/ximon/admin/QuartzTests.java
@@ -21,14 +21,6 @@
@Test
void addLightTask() {
- LightTaskParam lightTaskParam = new LightTaskParam();
- lightTaskParam.setTaskName("鏃ュ父浠诲姟");
- lightTaskParam.setPoleIdList(ListUtil.toList(1L));
- lightTaskParam.setWeek(126);
- lightTaskParam.setOpenOrder("1630100");
- lightTaskParam.setCloseOrder("0600000");
- lightTaskParam.setControlOrder("00000500300020");
- System.out.println(lightTaskService.addLightTask(lightTaskParam));
}
--
Gitblit v1.9.3