增加地图

aidex-admin/src/main/resources/application.yml

@@ -36,8 +36,8 @@ server:
 # 日志配置
 logging:
   level:
-    com.aidex: error
-    org.springframework: error
+    com.aidex: info
+    org.springframework: info
 
 # 用户配置
 user:
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.243
+    host: 127.0.0.1
     # 端口，默认为6379
-    port: 6379
+    port: 16379
     # 数据库索引
     database: 0
     # 密码
-    password: 12345678
+    # password: 12345678
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -135,3 +135,13 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+wx:
+  miniapp:
+    appid: wx89863f6cc3943d04 #微信小程序的appid
+    secret: 1d8a4519dd92e626e183c4c7e2dad14e  #微信小程序的Secret
+    msgDataFormat: JSON
+    token:
+    aesKey:
+
+

aidex-admin/target/classes/application.yml

@@ -36,8 +36,8 @@ server:
 # 日志配置
 logging:
   level:
-    com.aidex: error
-    org.springframework: error
+    com.aidex: info
+    org.springframework: info
 
 # 用户配置
 user:
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.1.243
+    host: 127.0.0.1
     # 端口，默认为6379
-    port: 6379
+    port: 16379
     # 数据库索引
     database: 0
     # 密码
-    password: 12345678
+    # password: 12345678
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -135,3 +135,13 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+wx:
+  miniapp:
+    appid: wx89863f6cc3943d04 #微信小程序的appid
+    secret: 1d8a4519dd92e626e183c4c7e2dad14e  #微信小程序的Secret
+    msgDataFormat: JSON
+    token:
+    aesKey:
+
+

aidex-common/pom.xml

@@ -58,7 +58,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -151,6 +151,13 @@
             <version>${pinyin4j.version}</version>
         </dependency>
 
+        <!--  引入微信小程序jar包  -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+            <version>4.6.0</version>
+        </dependency>
+
     </dependencies>
 <build>
     <resources>
@@ -169,4 +176,4 @@
         </resource>
     </resources>
 </build>
-</project>
+</project>

aidex-common/src/main/java/com/aidex/common/config/WxConfig.java

@@ -0,0 +1,42 @@
+package com.aidex.common.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import lombok.AllArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@AllArgsConstructor
+@Configuration
+@ConditionalOnClass({WxMaService.class})
+@EnableConfigurationProperties(WxProperties.class)
+public class WxConfig {
+
+	private final WxProperties wxProperties;
+
+	/**
+	 * 小程序配置
+	 * @return
+	 */
+	@Bean
+	@ConditionalOnMissingBean
+	public WxMaConfig wxMaConfig() {
+		WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+		config.setAppid(this.wxProperties.getAppid());
+		config.setSecret(this.wxProperties.getSecret());
+		return config;
+	}
+
+	@Bean
+	public WxMaService wxMaService(WxMaConfig maConfig) {
+		WxMaService service = new WxMaServiceImpl();
+		service.setWxMaConfig(maConfig);
+		return service;
+	}
+}
+

aidex-common/src/main/java/com/aidex/common/config/WxProperties.java

@@ -0,0 +1,44 @@
+package com.aidex.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ：ChenSir
+ * @date ：Created in 2024/3/18 10:45
+ * @description：读取微信小程序配置
+ */
+@Configuration
+@ConfigurationProperties(prefix = "wx.miniapp")
+public class WxProperties {
+
+	private String appid;
+
+	private String secret;
+
+	private String msgDataFormat;
+
+	public String getAppid() {
+		return appid;
+	}
+
+	public void setAppid(String appid) {
+		this.appid = appid;
+	}
+
+	public String getSecret() {
+		return secret;
+	}
+
+	public void setSecret(String secret) {
+		this.secret = secret;
+	}
+
+	public String getMsgDataFormat() {
+		return msgDataFormat;
+	}
+
+	public void setMsgDataFormat(String msgDataFormat) {
+		this.msgDataFormat = msgDataFormat;
+	}
+}

aidex-common/src/main/java/com/aidex/common/constant/Constants.java

@@ -194,4 +194,25 @@ public class Constants {
      * GPS_token 有效期（分钟）
      */
     public static final Integer GPS_TOKEN_EXPIRATION = 5;
+
+
+    /**
+     * 统计类型 - 周
+     */
+    public static final String STATISTICS_TYPE_WEEK = "week";
+
+    /**
+     * 统计类型 - 月
+     */
+    public static final String STATISTICS_TYPE_MONTH = "month";
+
+    /**
+     * 统计类型 - 年
+     */
+    public static final String STATISTICS_TYPE_YEAR = "year";
+
+    /**
+     * 航线存储前缀
+     */
+public static final String ROUTE_STORE_PREFIX =  "route_data:";
 }

aidex-common/src/main/java/com/aidex/common/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.aidex.common.utils;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -7,8 +9,6 @@ import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.commons.lang3.time.DateFormatUtils;
-
 /**
  * 时间工具类
  *
@@ -382,4 +382,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
+
+
+
+
 }