Merge branch 'main' of http://43.137.10.199:81/hfln/hfln-portal-service

pom.xml

@@ -21,9 +21,9 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+        <spring-boot.version>2.5.14</spring-boot.version>
         <baomidou.version>3.5.2</baomidou.version>
-        <spring-cloud.version>Hoxton.SR12</spring-cloud.version> <!-- Update Spring Cloud version -->
+        <spring-cloud.version>2020.0.6</spring-cloud.version> <!-- Update Spring Cloud version -->
         <easyexcel.version>3.3.2</easyexcel.version>
     </properties>
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/config/SaTokenConfigure.java

@@ -72,6 +72,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 		.addPathPatterns("/**")
 		.excludePathPatterns("/error");
 		
+		
 	}
 	
 	/**

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -232,11 +232,10 @@ public class MqttSubHandle {
 //							}
 //						}
 
-            if (userIds.size() > 0) {
+            if (!userIds.isEmpty()) {
                 // 拥有者和被分享者phone
                 List<UserInfo> userInfos = userService.listByIds(userIds);
-                for (int i = 0; i < userInfos.size(); i++) {
-                    UserInfo user = userInfos.get(i);
+                for (UserInfo user : userInfos) {
                     // 发送跌倒短信
                     log.info("mqttutil--开始发送跌倒消息");
                     log.info("mqttutil--sendmsg:phone{}, dev_name:{}", user.getPhone(), devName.toString());
@@ -254,7 +253,7 @@ public class MqttSubHandle {
                     // 发送微信公告号消息
                     wxOfficeAccountClient.sendMsg(devId, devName.toString(), user.getPhone(), fwhOpenId, "设备检测到跌倒，请前往小程序查看详细信息");
                     log.info("发送微信公众号消息发完了");
-                    }
+                }
                 }
 
             }
@@ -269,10 +268,10 @@ public class MqttSubHandle {
 
         List<DevInfo> devs = devInfoService.queryByClientId(clientId);
         List<Long> userIds = new ArrayList<>();
-        StringBuffer devName = new StringBuffer("");
+        StringBuilder devName = new StringBuilder();
         String devId = "";
         // 设备拥有者openid
-        if (devs != null && devs.size() > 0) {
+        if (devs != null && !devs.isEmpty()) {
             DevInfo dev = devs.get(0);
             userIds.add(dev.getUserId());
             devName.append(dev.getDevName());
@@ -287,7 +286,7 @@ public class MqttSubHandle {
 //							}
 //						}
 
-        if (userIds.size() > 0) {
+        if (!userIds.isEmpty()) {
             // 拥有者和被分享者phone
             List<UserInfo> userInfos = userService.listByIds(userIds);
             for (int i = 0; i < userInfos.size(); i++) {
@@ -338,7 +337,7 @@ public class MqttSubHandle {
 
         String targetPointsStr = JSON.toJSONString(targetPoints);
         List<DevInfo> devs = devInfoService.queryByClientId(clientId);
-        if (devs != null && devs.size() > 0) {
+        if (devs != null && !devs.isEmpty()) {
             DevInfo dev = devs.get(0);
             if (!targetPointsStr.equals(dev.getTargetPoints())) {
                 //  存储跌倒事件
@@ -451,7 +450,7 @@ public class MqttSubHandle {
         vo.setLength(length);
 
         List<DevInfo> devs = devInfoService.queryByClientId(clientId);
-        if (devs.size() > 0) {
+        if (!devs.isEmpty()) {
 
             devInfoService.update(vo, new LambdaUpdateWrapper<DevInfo>().eq(DevInfo::getClientId, clientId));
 

portal-service-server/pom.xml

@@ -28,6 +28,16 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
@@ -59,6 +69,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+        </dependency>
+
         <!--        <dependency>-->
 <!--            <groupId>org.springframework.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-starter-bootstrap</artifactId>-->

portal-service-server/src/main/resources/bootstrap-dev.yml

@@ -99,10 +99,6 @@ mqtt:
   keepalive: 60
   clean-session: true
   automatic-reconnect: true
-  max-reconnect-delay: 10000
-  connection-timeout: 30
-  max-message-size: 1048576
-  ssl: false
 
 # oss 存储
 oss:

portal-service-server/src/main/resources/bootstrap-test.yml

@@ -17,8 +17,6 @@ spring:
     port: 6379
     # 数据库索引
     database: 5
-    # 密码
-    password: Hfln@1024
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -54,7 +52,15 @@ lnxx:
   # 微信小程序
   wechat:
     appid: wx60b2cd643b46d5eb
-    secret: 15ebd7bed7b73d806eba2944f4e07592
+    secret: a7c1e377869fffb6fcbacca979d77617
+    #微信公众号
+    office:
+      account:
+        appId: wx9b479fa3c2af4f21
+        secret: 426effb7b58f9ba7c5f6dd1062db0074
+        templateId: -wNA7XW0_4hscmIUK-hmolNpccd-zMlyGnKUvpGdfZQ
+    bind:
+      callbackUrl: https://jkld.radar-power.cn
   # 短信验证码相关
   sms:
     tencent:
@@ -74,10 +80,29 @@ sa-token:
   # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
   active-timeout: -1
   # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
-  is-concurrent: true
+  is-concurrent: false
   # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
   is-share: false
   # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
   token-style: uuid
   # 是否输出操作日志
-  is-log: true
+  is-log: true
+
+# mqtt相关
+mqtt:
+  broker: tcp://8.130.28.21:1883
+  client-id: ${spring.application.name}-${random.uuid}
+  username: admin
+  password: public
+
+
+# oss 存储
+oss:
+  accessKey:
+    id: LTAI5t9ZjmmHVs7nseZx3xWT
+    secret: TbmTSDP9ztXrLa4gXBhAmjerQcKGj7
+  endpoint: oss-cn-shanghai.aliyuncs.com
+  bucket: lnxx.oss-cn-shanghai.aliyuncs.com
+  region: cn-shanghai
+  expire:
+    seconds: 300

portal-service-server/src/main/resources/bootstrap.yml

@@ -3,17 +3,12 @@ server:
 spring:
   mvc:
     pathmatch:
-      matching-strategy: ant_path_matcher
+      matching-strategy: ant-path-matcher
   profiles:
-    active: local
+    active: test
   application:
     name: portal-service-server
 
-logging:
-  level:
-    root: info
-
-
 feign:
   okhttp:
     enabled: true

portal-service-server/src/main/resources/logback-spring.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="false" scanPeriod="60 seconds">
-
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <springProperty scope="context" name="appName" source="spring.application.name" defaultValue="hfln-service"  />
-    <springProperty scope="context" name="printConsole" source="log.console.print" defaultValue="true"  />
-
-    <property name="LOG_PATH" value="/data/logs" />
-
-    <!-- 控制台设置 -->
-    <contextName>logback</contextName>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${PID:- }){magenta} %clr(${appName}){faint} %clr([%15.15t]){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(%-40.40logger{39}){cyan} %clr([line: %4line]){magenta} %clr(:){faint} %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- ALL -->
-    <appender name="allAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/${appName}/all.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/${appName}/${appName}-info-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>3000MB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|-|${appName}|-|%thread|-|%level|-|%logger|-|%msg%n</pattern>
-        </encoder>
-    </appender>
-
-
-    <!-- ERROR -->
-    <appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_PATH}/${appName}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>${LOG_PATH}/${appName}/${appName}-error-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <maxFileSize>100MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>3000MB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}|-|${appName}|-|%thread|-|%level|-|%logger|-|%msg%n</pattern>
-        </encoder>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>ERROR</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="allAsyncLog" class="ch.qos.logback.classic.AsyncAppender">
-        <param name="discardingThreshold" value="0"/>
-        <param name="queueSize" value="4096"/>
-        <appender-ref ref="allAppender" />
-    </appender>
-
-    <appender name="errorAsyncLog" class="ch.qos.logback.classic.AsyncAppender">
-        <param name="discardingThreshold" value="0"/>
-        <param name="queueSize" value="2048"/>
-        <appender-ref ref="errorAppender" />
-    </appender>
-
-    <logger name="org" level="info"/>
-    <logger name="com.netflix" level="ERROR"/>
-    <logger name="com.sun" level="ERROR"/>
-    <logger name="io.lettuce" level="ERROR"/>
-    <logger name="com.alibaba" level="ERROR"/>
-    <logger name="springfox" level="ERROR"/>
-    <logger name="sun.rmi" level="ERROR"/>
-    <logger name="sun.net" level="ERROR"/>
-    <logger name="javax" level="ERROR"/>
-    <logger name="com.hfln" level="DEBUG"/>
-    <!--<logger name="com.xxl" level="ERROR"/>-->
-    <logger name="org.mongodb.driver" level="ERROR"/>
-
-
-    <root level="INFO">
-        <!--<root level="DEBUG">-->
-        <if condition='property("printConsole").equals("true")'>
-            <then>
-                <appender-ref ref="STDOUT"/>
-            </then>
-        </if>
-        <appender-ref ref="allAsyncLog"/>
-        <!--<appender-ref ref="debugAsyncLog"/>
-        <appender-ref ref="warnAsyncLog"/>-->
-        <appender-ref ref="errorAsyncLog"/>
-    </root>
-</configuration>
-
-

portal-service-server/src/test/java/com/hfln/portal/TestApplication.java

@@ -1,13 +0,0 @@
-package com.hfln.portal;
-
-import com.hfln.portal.server.Application;
-import org.springframework.boot.SpringApplication;
-import org.springframework.context.ApplicationContext;
-
-public class TestApplication {
-
-    public static void main(String[] args) {
-        //这里填的是TestApplication
-        ApplicationContext context = SpringApplication.run(Application.class, args);
-    }
-}