diff --git a/pom.xml b/pom.xml
index 41baaba..3ccc782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,18 @@
${springdoc.version}
+
+
+ io.swagger.core.v3
+ swagger-annotations
+ 2.2.21
+
+
+ io.swagger.core.v3
+ swagger-models
+ 2.2.21
+
+
commons-io
diff --git a/ruoyi-piao/src/main/java/com/ruoyi/piao/controller/AIController.java b/ruoyi-piao/src/main/java/com/ruoyi/piao/controller/AIController.java
index dc46c7b..81972c2 100644
--- a/ruoyi-piao/src/main/java/com/ruoyi/piao/controller/AIController.java
+++ b/ruoyi-piao/src/main/java/com/ruoyi/piao/controller/AIController.java
@@ -52,7 +52,7 @@ public class AIController {
String prompt = "你是一个机票票务AI助手。请根据当前中国民航市场情况,生成当前最热门的国内航线列表。" +
"请直接返回JSON数组,不要加markdown代码块标记,格式为:[{\"route\": \"北京-上海\", \"reason\": \"商务航线,客流量大\", \"rank\": 1}]。" +
- "返回8条,按热门程度排序,每条reason用中文简要描述热门原因。";
+ "返回7条,按热门程度排序,每条reason用中文简要描述热门原因。";
String aiResponse = chatClient.prompt()
.system("你是一个民航数据分析助手,只返回纯JSON数组,不要任何其他文字和markdown标记。")
diff --git a/ruoyi-piao/src/main/java/com/ruoyi/web/core/config/SpringDocConfig.java b/ruoyi-piao/src/main/java/com/ruoyi/web/core/config/SpringDocConfig.java
index b5c4f7a..809f400 100644
--- a/ruoyi-piao/src/main/java/com/ruoyi/web/core/config/SpringDocConfig.java
+++ b/ruoyi-piao/src/main/java/com/ruoyi/web/core/config/SpringDocConfig.java
@@ -28,10 +28,6 @@ public class SpringDocConfig
@Value("${springdoc.enabled}")
private boolean enabled;
- /** 设置请求的统一前缀 */
- @Value("${springdoc.pathMapping}")
- private String pathMapping;
-
/**
* 创建API
*/
diff --git a/ruoyi-piao/src/main/resources/application-prod.yml b/ruoyi-piao/src/main/resources/application-prod.yml
index 9d44823..4fcc224 100644
--- a/ruoyi-piao/src/main/resources/application-prod.yml
+++ b/ruoyi-piao/src/main/resources/application-prod.yml
@@ -232,10 +232,14 @@ pagehelper:
springdoc:
# 是否开启springdoc
enabled: true
- # 请求前缀
- pathMapping: /dev-api
+ # 扫描包路径
packages-to-scan: com.ruoyi.web.controller
+ api-docs:
+ enabled: false # 开发环境true,生产环境改为false
+ swagger-ui:
+ enabled: true
+
# 防止XSS攻击
xss:
# 过滤开关
diff --git a/ruoyi-piao/src/main/resources/application.yml b/ruoyi-piao/src/main/resources/application.yml
index fb09dd7..8932332 100644
--- a/ruoyi-piao/src/main/resources/application.yml
+++ b/ruoyi-piao/src/main/resources/application.yml
@@ -234,11 +234,12 @@ pagehelper:
springdoc:
# 是否开启springdoc
enabled: true
- # 请求前缀
- pathMapping: /dev-api
# 扫描包路径
packages-to-scan: com.ruoyi.web.controller
-
+ api-docs:
+ enabled: true # 开发环境true,生产环境改为false
+ swagger-ui:
+ enabled: true
# 防止XSS攻击
xss:
# 过滤开关
diff --git a/ruoyi-uia/src/components/AIChat.vue b/ruoyi-uia/src/components/AIChat.vue
index 42b2fde..790e216 100644
--- a/ruoyi-uia/src/components/AIChat.vue
+++ b/ruoyi-uia/src/components/AIChat.vue
@@ -268,7 +268,7 @@ const sendMessage = async () => {
.ai-chat-float-btn {
position: fixed;
top: 8px;
- right: 110px;
+ right: 115px;
z-index: 999;
width: 34px !important;
height: 34px !important;
diff --git a/ruoyi-uia/src/views/HomePage.vue b/ruoyi-uia/src/views/HomePage.vue
index b3c852e..5e27ce2 100644
--- a/ruoyi-uia/src/views/HomePage.vue
+++ b/ruoyi-uia/src/views/HomePage.vue
@@ -778,7 +778,7 @@ progress[value]::-webkit-progress-value {
// 3秒内紧急倒计时样式
.countdown-urgent {
- background: rgba(255, 143, 145, 0.9);
+ background: rgb(246 90 95 );
color: #fff;
font-size: 15px;
font-weight: bold;
@@ -891,7 +891,7 @@ progress[value]::-webkit-progress-value {
display: flex !important;
align-items: center !important;
flex: 0 0 auto !important;
- padding-right: 10px;
+ padding-right: 15px;
}
.user-dropdown {
diff --git a/ruoyi-uia/src/views/LoginPageNew.vue b/ruoyi-uia/src/views/LoginPageNew.vue
deleted file mode 100644
index f1d13bb..0000000
--- a/ruoyi-uia/src/views/LoginPageNew.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 智汇票务b
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ loginFormModel.loginButtonName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ruoyi-uia/src/views/piao/order/list-detail.vue b/ruoyi-uia/src/views/piao/order/list-detail.vue
index 21d97c9..feb7221 100644
--- a/ruoyi-uia/src/views/piao/order/list-detail.vue
+++ b/ruoyi-uia/src/views/piao/order/list-detail.vue
@@ -668,7 +668,7 @@ defineExpose({ showOrderDetail });
}
.ticketedCell {
- background-color: #24e72a;
+ background-color: #66d36a;
color: #ffffff;
height: 22px;
text-align: center;
diff --git a/ruoyi-uia/src/views/piao/order/list.vue b/ruoyi-uia/src/views/piao/order/list.vue
index 67aa950..9cb2d9b 100644
--- a/ruoyi-uia/src/views/piao/order/list.vue
+++ b/ruoyi-uia/src/views/piao/order/list.vue
@@ -1211,7 +1211,7 @@ const tongchengNotify = async () => {
padding: 0 6px;
}
.orderTable .ticketedCell {
- background-color: #24e72a;
+ background-color: #66d36a;
color: #ffffff;
height: 22px;
text-align: center;