pom.xml

@@ -106,13 +106,27 @@
         </dependency>
     </dependencies>
 
+    <repositories>  <!-- 配置阿里云镜像仓库 -->
+        <repository>
+            <id>nexus-aliyun</id>
+            <name>nexus-aliyun</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <!-- maven多环境打包配置 -->
     <profiles>
-        <!-- 开发环境 -->
+        <!-- 测试环境 -->
         <profile>
-            <id>dev</id>
+            <id>test</id>
             <properties>
-                <spring.profiles.active>dev</spring.profiles.active>
+                <profiles.active>test</profiles.active>
             </properties>
             <!-- 设置为默认环境 -->
             <activation>
@@ -123,7 +137,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
+                <profiles.active>prod</profiles.active>
             </properties>
         </profile>
     </profiles>
@@ -131,24 +145,24 @@
     <!--添加maven插件，项目的打包工具，打成jar包，否则在打包运行时报错   -->
     <build>
         <!-- 打包名格式：项目名-环境.jar -->
-        <finalName>${project.artifactId}-${spring.profiles.active}</finalName>
+        <finalName>${project.artifactId}-${profiles.active}</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <testSourceDirectory>src/test/java</testSourceDirectory>
         <resources>
             <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.yml</include>
-                    <include>**/*.properties</include>
-                </includes>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>test/*</exclude>
+                    <exclude>prod/*</exclude>
+                </excludes>
             </resource>
             <resource>
-                <directory>src/main/resources</directory>
+                <directory>src/main/resources/${profiles.active}</directory>
+                <filtering>true</filtering>
                 <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.yml</include>
-                    <include>**/*.properties</include>
+                    <include>*.yml</include>
+                    <include>*.xml</include>
                 </includes>
-                <filtering>true</filtering>
             </resource>
         </resources>
         <plugins>

src/main/java/com/welampiot/common/InterfaceResultEnum.java

@@ -0,0 +1,49 @@
+package com.welampiot.common;
+
+public enum InterfaceResultEnum {
+    LOGIN_ERROR("0000","操作成功","Operation successful","Операция прошла успешно"),
+    LOGIN_FAIL("0001","参数异常","Parameter abnormality","Параметры аномалии");
+    private String code;
+    private String msgCn;
+    private String msgEn;
+    private String msgRu;
+
+    InterfaceResultEnum(String code, String msgCn, String msgEn, String msgRu) {
+        this.code = code;
+        this.msgCn = msgCn;
+        this.msgEn = msgEn;
+        this.msgRu = msgRu;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsgCn() {
+        return msgCn;
+    }
+
+    public void setMsgCn(String msgCn) {
+        this.msgCn = msgCn;
+    }
+
+    public String getMsgEn() {
+        return msgEn;
+    }
+
+    public void setMsgEn(String msgEn) {
+        this.msgEn = msgEn;
+    }
+
+    public String getMsgRu() {
+        return msgRu;
+    }
+
+    public void setMsgRu(String msgRu) {
+        this.msgRu = msgRu;
+    }
+}

src/main/java/com/welampiot/controller/PolicyController.java

@@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static com.sun.xml.internal.ws.policy.sourcemodel.wspolicy.XmlToken.Policy;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @CrossOrigin

src/main/resources/application-dev.yml

@@ -1,55 +0,0 @@
-server:
-  port: 8089
-  servlet:
-    context-path: /welampiot
-
-spring:
-  # 指定哪个文件，比如dev.yml local.yml
-#  profiles:
-#    active: @spring.profiles.active@
-  application:
-    name: welampiot
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    #数据库连接中数据源类型
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      url: jdbc:mysql://139.196.213.241:3306/welampiot?characterEncoding=utf-8&useSSL=false
-      username: welampiot
-      password: XPDejO2KMJ5WZB5a8G3oOIJPkibY1v3Vm9PDI2C+8DQM15FGGQUCGlLGAxiMbBMphX5HNNXy6iAbbZC9GkKzWw==
-      # encrypt config
-      filters: config
-      connect-properties:
-        config.decrypt: true
-        config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
-  #      config.decrypt.key: ${spring.datasource.druid.publickey}
-#  jackson:
-#    serialization:
-#      write-null-map-values: true
-#  gson:
-#    serialize-nulls: true
-
-welampiot:
-  mqtt:
-    url: tcp://139.196.213.241:1883
-    clientId: welampiot_mqtt_client
-    topics: /#
-    username: admin
-    password: admin
-    timeout: 10
-    keepalive: 20
-
-mybatis:
-  mapper-locations: classpath:/mapper/*.xml
-  check-config-location: true
-  type-aliases-package: com.welampiot
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-debug: true
-
-logging:
-  file:
-    path: /logs/cis
-  level:
-    root: info
-  config: classpath:logback.xml

src/main/resources/logback.xml

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <!-- appender是configuration的子节点，是负责写日志的组件。 -->
-    <!-- ConsoleAppender：把日志输出到控制台 -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- 默认情况下，每个日志事件都会立即刷新到基础输出流。 这种默认方法更安全，因为如果应用程序在没有正确关闭appender的情况下退出，则日志事件不会丢失。
-         但是，为了显着增加日志记录吞吐量，您可能希望将immediateFlush属性设置为false -->
-        <!--<immediateFlush>true</immediateFlush>-->
-        <encoder>
-            <!-- %37():如果字符没有37个字符长度,则左侧用空格补齐 -->
-            <!-- %-37():如果字符没有37个字符长度,则右侧用空格补齐 -->
-            <!-- %15.15():如果记录的线程字符长度小于15(第一个)则用空格在左侧补齐,如果字符长度大于15(第二个),则从开头开始截断多余的字符 -->
-            <!-- %-40.40():如果记录的logger字符长度小于40(第一个)则用空格在右侧补齐,如果字符长度大于40(第二个),则从开头开始截断多余的字符 -->
-            <!-- %msg：日志打印详情 -->
-            <!-- %n:换行符 -->
-            <!-- %highlight():转换说明符以粗体红色显示其级别为ERROR的事件，红色为WARN，BLUE为INFO，以及其他级别的默认颜色。 -->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) --- [%15.15(%thread)] %cyan(%-40.40(%logger{40})) : %msg%n</pattern>
-            <!-- 控制台也要使用UTF-8，不要使用GBK，否则会中文乱码 -->
-            <charset>UTF-8</charset>
-        </encoder>
-    </appender>
-
-    <appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern><![CDATA[%n[%d{yyyy-MM-dd HH:mm:ss.SSS}] [level: %p] [Thread: %t] [ Class:%c >> Method: %M:%L ]%n%p:%m%n]]></pattern>
-            <!-- 记录日志的编码:此处设置字符集 - -->
-            <charset>UTF-8</charset>
-        </encoder>
-        <file>logs/cis.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 日志文件的名字会根据fileNamePattern的值，每隔一段时间改变一次 -->
-            <fileNamePattern>logs/his/%d{yyyyMM}/cis.-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
-            <!-- 每产生一个日志文件，该日志文件的保存期限为30天, ps:maxHistory的单位是根据fileNamePattern中的翻转策略自动推算出来的,例如上面选用了yyyy-MM-dd,则单位为天
-            如果上面选用了yyyy-MM,则单位为月,另外上面的单位默认为yyyy-MM-dd-->
-            <maxHistory>30</maxHistory>
-            <!-- 每个日志文件到1G的时候开始切分，最多保留30天，但最大到200GB，哪怕没到30天也要删除多余的日志 -->
-            <totalSizeCap>50GB</totalSizeCap>
-            <!-- maxFileSize:这是活动文件的大小 -->
-            <maxFileSize>500MB</maxFileSize>
-        </rollingPolicy>
-    </appender>
-    <logger name="record" level="DEBUG" additivity="false">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="LOG_FILE"/>
-        <!--<appender-ref ref="myAppender"/>-->
-    </logger>
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="LOG_FILE"/>
-        <!--<appender-ref ref="mqAppender"/>-->
-    </root>
-</configuration>

src/main/resources/application-prod.yml

@@ -21,6 +21,10 @@ spring:
       filters: config
       connect-properties:
         config.decrypt: true
+<<<<<<< HEAD:src/main/resources/prod/application.yml
+#        config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
+        config.decrypt.key: ${spring.datasource.druid.publickey}
+=======
         config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
   #      config.decrypt.key: ${spring.datasource.druid.publickey}
 #  jackson:
@@ -39,13 +43,14 @@ welampiot:
     timeout: 10
     keepalive: 20
 
+>>>>>>> 88427924a01a77a4971f067c9a1b13afdc761b62:src/main/resources/application-prod.yml
 mybatis:
   mapper-locations: classpath:/mapper/*.xml
   check-config-location: true
   type-aliases-package: com.welampiot
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-debug: true
+debug: false
 
 logging:
   file:

src/main/resources/application.yml

@@ -4,9 +4,6 @@ server:
     context-path: /welampiot
 
 spring:
-  # 指定哪个文件，比如dev.yml local.yml
-#  profiles:
-#    active: @spring.active@
   application:
     name: welampiot
   datasource:
@@ -17,12 +14,16 @@ spring:
       url: jdbc:mysql://139.196.213.241:3306/welampiot?characterEncoding=utf-8&useSSL=false
       username: welampiot
       password: XPDejO2KMJ5WZB5a8G3oOIJPkibY1v3Vm9PDI2C+8DQM15FGGQUCGlLGAxiMbBMphX5HNNXy6iAbbZC9GkKzWw==
+      initialSize: 5
+      minIdle: 5
+      maxActive: 100
+      maxWait: 60000
       # encrypt config
       filters: config
       connect-properties:
         config.decrypt: true
         config.decrypt.key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAI5wh9Y/+kW7LK1jgUTygp2wk5uVUucBheqNDeKPAKH/orx1r1GF4mcFgfaBYO/hyVJC7Gk3xf6ypKd2MCrFRXsCAwEAAQ==
-  #      config.decrypt.key: ${spring.datasource.druid.publickey}
+#        config.decrypt.key: ${publickey}
 #  jackson:
 #    serialization:
 #      write-null-map-values: true