Merge remote-tracking branch 'origin/20210716' into 20210716

user_center/pom.xml

@@ -72,61 +72,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.build.timestamp.format>yyyy-MM-dd_HH_mm</maven.build.timestamp.format>
-
-            <jdk.version>1.8</jdk.version>
-
     </properties>
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.yml</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.tld</include>
-                    <include>**/*.xlsx</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
-                    <showWarnings>true</showWarnings>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
-                <configuration></configuration>
-            </plugin>
-        </plugins>
+        <finalName>user_center-1.0-SNAPSHOT</finalName>
     </build>
 </project>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/MeasurementSettlementController.java

@@ -38,7 +38,7 @@ public class MeasurementSettlementController {
     }
     @PostMapping(value = "/add")
     @ApiOperation(value = "新增结算计划")
-    @LogAnnotation(module = "【设备管理】修改")
+    @LogAnnotation(module = "【结算计划】新增")
     public AjaxMessage<Void> addPlan(@RequestBody @Valid MeasurementSettlementDto measurementSettlementDto) {
         measurementSettlementService.addPlan(measurementSettlementDto);
         return AjaxMessage.success();

zoniot-rmcp/zoniot-rmcp-web/src/main/resources/application-sit.properties

@@ -103,7 +103,7 @@ dispath.queue=dispath
 
 
 ribbon.OkToRetryOnAllOperations=false
-ribbon.ReadTimeout=5000:
+ribbon.ReadTimeout=5000
 ribbon.ConnectTimeout=3000
 xxl.job.admin.addresses=http://10.0.0.62:8080/xxl-job-admin/
 xxl.job.group.id=8