Merge remote-tracking branch 'origin/master'

liuhaonan

2021-12-27 b0738a0a82c2a044136ff13ae6ba9bafc950e071

Merge remote-tracking branch 'origin/master'

 .run/²âÊÔ-¹ÜÀí¶Ë.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 &amp;&amp; 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>

 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>

 dao/src/main/resources/application.properties

ÎļþÒÑɾ³ý

 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>

 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>
        <!--默认开启dev-->
        <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>
        <!--默认开启dev-->
        <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>

 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


 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));
    }