From 1bc78e80b7ca96a0ce834ee519efcd77618ab798 Mon Sep 17 00:00:00 2001
From: Cxx0822 <1556464090@qq.com>
Date: Tue, 10 Jun 2025 20:02:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
admin-service/pom.xml | 16 +--
.../admin/controller/SessionController.java | 2 +
.../src/main/resources/application-dev.yml | 7 +-
.../src/main/resources/application-docker.yml | 7 -
.../src/main/resources/application-prod.yml | 6 -
.../src/main/resources/application.yml | 2 +-
.../main/resources/logback-spring-drop.xml | 120 ------------------
.../src/main/resources/application-dev.yml | 2 +-
.../src/main/resources/application.yml | 2 +-
9 files changed, 14 insertions(+), 150 deletions(-)
delete mode 100644 admin-service/src/main/resources/logback-spring-drop.xml
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
index 1f94e39..5fe5393 100644
--- a/admin-service/pom.xml
+++ b/admin-service/pom.xml
@@ -47,12 +47,12 @@
-
-
-
-
-
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/admin-service/src/main/java/com/cxx/admin/controller/SessionController.java b/admin-service/src/main/java/com/cxx/admin/controller/SessionController.java
index f4a55c3..9ac3d54 100644
--- a/admin-service/src/main/java/com/cxx/admin/controller/SessionController.java
+++ b/admin-service/src/main/java/com/cxx/admin/controller/SessionController.java
@@ -1,5 +1,6 @@
package com.cxx.admin.controller;
+import cn.dev33.satoken.annotation.SaIgnore;
import com.cxx.common.dto.user.SessionDto;
import com.cxx.admin.service.SessionService;
import io.swagger.v3.oas.annotations.Operation;
@@ -16,6 +17,7 @@ public class SessionController {
@Operation(summary = "创建会话")
@PostMapping("")
+ @SaIgnore
public SessionDto createSession(@RequestParam String name,
@RequestParam String password) {
return sessionService.create(name, password);
diff --git a/admin-service/src/main/resources/application-dev.yml b/admin-service/src/main/resources/application-dev.yml
index d85af55..d03fa4c 100644
--- a/admin-service/src/main/resources/application-dev.yml
+++ b/admin-service/src/main/resources/application-dev.yml
@@ -3,12 +3,7 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
- password: 123456
-
-logging:
- level:
- root: info
- config:
+ password: estun@medical
file:
path: D:\\temp\\
diff --git a/admin-service/src/main/resources/application-docker.yml b/admin-service/src/main/resources/application-docker.yml
index 141dfac..dafb638 100644
--- a/admin-service/src/main/resources/application-docker.yml
+++ b/admin-service/src/main/resources/application-docker.yml
@@ -5,12 +5,5 @@ spring:
username: docker
password: 19940822Cxx
-logging:
- fluentd:
- host: fluent-bit
- port: 24224
- level:
- root: info
-
file:
path: /upload-file/
\ No newline at end of file
diff --git a/admin-service/src/main/resources/application-prod.yml b/admin-service/src/main/resources/application-prod.yml
index b75d9df..0bdcd3b 100644
--- a/admin-service/src/main/resources/application-prod.yml
+++ b/admin-service/src/main/resources/application-prod.yml
@@ -5,12 +5,6 @@ spring:
username: cxx
password: 19940822Cxx@1213
-logging:
- level:
- root: info
- config:
- classpath:logback-spring-drop.xml
-
file:
path: /root/docker/upload-file/
log-path: /root/service/logs/
\ No newline at end of file
diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
index 46ea264..07586af 100644
--- a/admin-service/src/main/resources/application.yml
+++ b/admin-service/src/main/resources/application.yml
@@ -33,4 +33,4 @@ influxdb:
bucket: server_metrics
web-starter:
- base-package: com.cxx.service
\ No newline at end of file
+ base-package: com.cxx.admin
\ No newline at end of file
diff --git a/admin-service/src/main/resources/logback-spring-drop.xml b/admin-service/src/main/resources/logback-spring-drop.xml
deleted file mode 100644
index d6f5043..0000000
--- a/admin-service/src/main/resources/logback-spring-drop.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
- logback
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUG
-
-
-
- ${CONSOLE_LOG_PATTERN}
-
- ${ENCODING}
-
-
-
-
-
-
-
- INFO
- ACCEPT
- DENY
-
-
- ${log.path}/log_info.log
-
- ${FILE_LOG_PATTERN}
- ${ENCODING}
-
-
-
-
- ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log
-
- 500MB
-
-
- 15
-
-
-
-
-
-
- WARN
- ACCEPT
- DENY
-
-
- ${log.path}/log_warn.log
-
- ${FILE_LOG_PATTERN}
- ${ENCODING}
-
-
-
- ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log
-
- 100MB
-
-
- 15
-
-
-
-
-
-
- ERROR
- ACCEPT
- DENY
-
-
- ${log.path}/log_error.log
-
- ${FILE_LOG_PATTERN}
- ${ENCODING}
-
-
-
- ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log
-
- 100MB
-
-
- 15
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/home-service/src/main/resources/application-dev.yml b/home-service/src/main/resources/application-dev.yml
index 56c58fe..628463e 100644
--- a/home-service/src/main/resources/application-dev.yml
+++ b/home-service/src/main/resources/application-dev.yml
@@ -3,4 +3,4 @@ spring:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
- password: 123456
+ password: estun@medical
diff --git a/home-service/src/main/resources/application.yml b/home-service/src/main/resources/application.yml
index 797d506..eeb4a86 100644
--- a/home-service/src/main/resources/application.yml
+++ b/home-service/src/main/resources/application.yml
@@ -6,7 +6,7 @@ spring:
name: @project.artifactId@
version: @project.version@
profiles:
- active: prod
+ active: dev
mail:
host: smtp.163.com
port: 465