From 5d0b276e70f9b15582d2771068c27e975b2abdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Wed, 21 Jun 2023 10:59:35 +0800
Subject: [PATCH] =?UTF-8?q?maven=E6=89=93=E5=8C=85=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=20token=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 25 +++++++++++++++++++
 .../annotation/aspect/OperateLogAspect.java   |  3 ++-
 src/main/resources/application-test.yml       |  8 ++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae5860d..058f802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,21 @@
     </dependencies>
 
     <build>
+        <finalName>foreignExchangeTrading</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -126,6 +140,17 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <delimiters>
+                        <delimiter>@</delimiter>
+                    </delimiters>
+                    <useDefaultDelimiters>false</useDefaultDelimiters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/annotation/aspect/OperateLogAspect.java b/src/main/java/com/sztzjy/forex/trading_trading/annotation/aspect/OperateLogAspect.java
index 1852e39..5d9ef65 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/annotation/aspect/OperateLogAspect.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/annotation/aspect/OperateLogAspect.java
@@ -4,6 +4,7 @@ import cn.hutool.core.util.URLUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import cn.hutool.http.HttpUtil;
 import com.sztzjy.forex.trading_trading.annotation.OperateLog;
+import com.sztzjy.forex.trading_trading.config.Constant;
 import com.sztzjy.forex.trading_trading.config.LogRecordEvent;
 import com.sztzjy.forex.trading_trading.config.SpringContextHolder;
 import com.sztzjy.forex.trading_trading.config.security.JwtUser;
@@ -55,7 +56,7 @@ public class OperateLogAspect implements Ordered {
         Log logRecord = new Log();
         JwtUser curUser = null;
         try {
-            String token = request.getHeader("token");
+            String token = request.getHeader(Constant.AUTHORIZATION);
             curUser = TokenProvider.getJWTUser(token);
         } catch (Exception e) {
             logRecord.setOperatorName("匿名");
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index e69de29..6ec8785 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -0,0 +1,8 @@
+spring:
+  datasource:
+    druid:
+      db-type: mysql
+      url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:foreign_exchange_trading}?useSSL=false&serverTimezone=UTC
+      username: ${DB_USER:root}
+      password: ${DB_PWD:sztzjy2017}
+      driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file