更改

.idea/workspace.xml

@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AnalysisUIOptions">
-    <option name="SPLITTER_PROPORTION" value="0.9004098" />
-  </component>
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="bdbed5d1-a156-40f3-aecd-82caf556ca52" name="更改" comment="更改">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/Application.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/Application.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/domain/GatewayRoutes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/domain/GatewayRoutes.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/ThirdPartyAuthFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/ThirdPartyAuthFilter.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/repository/JdbcRouteDefinitionRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/repository/JdbcRouteDefinitionRepository.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/service/impl/GatewayRoutesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/service/impl/GatewayRoutesServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/service/impl/PtServiceAlarmServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/service/impl/PtServiceAlarmServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/startup/ApplicationStartup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/com/goldenwater/startup/ApplicationStartup.java" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Interface" />
-        <option value="Class" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="KubernetesApiPersistence">{}</component>
-  <component name="KubernetesApiProvider">{
-  &quot;isMigrated&quot;: true
-}</component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 3
-}</component>
-  <component name="ProjectId" id="30wEzbqK57NNv4x13f0c1kMImPD" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Maven. [org.apache.maven.plugins:maven-archetype-plugin:RELEASE:generate].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.sh-model-gateway [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.sh-model-gateway [install].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.sh-model-gateway [package].executor&quot;: &quot;Run&quot;,
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;Spring Boot.Application.executor&quot;: &quot;Debug&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/GWprojects/TBA_GXPT_GATEWAY&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="D:\Workspaces\sh-model-gateway\src\main\java\cn\com\goldenwater\core\domain" />
-      <recent name="D:\Workspaces\sh-model-gateway\src\main\java\cn\com\goldenwater\core" />
-      <recent name="D:\Workspaces\sh-model-gateway\src\main\resources" />
-      <recent name="D:\Workspaces\sh-model-gateway\src\main\java\cn\com\goldenwater\controller" />
-      <recent name="D:\Workspaces\sh-model-gateway\src\main\java\cn\com\goldenwater\service\impl" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="cn.com.goldenwater.utils" />
-      <recent name="cn.com.goldenwater.enums" />
-      <recent name="cn.com.goldenwater.exception" />
-      <recent name="cn.com.goldenwater.filter" />
-      <recent name="cn.com.goldenwater.domain" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
-      <module name="tba-gxpt-gateway" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.goldenwater.Application" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="cn.com.goldenwater.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Spring Boot.Application" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="bdbed5d1-a156-40f3-aecd-82caf556ca52" name="更改" comment="" />
-      <created>1754530500690</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1754530500690</updated>
-      <workItem from="1754530501608" duration="15558000" />
-      <workItem from="1754615216986" duration="15530000" />
-      <workItem from="1754976835705" duration="12465000" />
-      <workItem from="1755047186213" duration="2320000" />
-      <workItem from="1755080364350" duration="1408000" />
-      <workItem from="1755164620975" duration="148000" />
-      <workItem from="1755504196752" duration="11826000" />
-      <workItem from="1755569708301" duration="882000" />
-      <workItem from="1755570982053" duration="216000" />
-      <workItem from="1755593649204" duration="2092000" />
-      <workItem from="1755652749121" duration="629000" />
-      <workItem from="1756188699669" duration="5392000" />
-      <workItem from="1756863250981" duration="10441000" />
-      <workItem from="1756949043982" duration="3196000" />
-      <workItem from="1756986741902" duration="1590000" />
-      <workItem from="1756989970558" duration="611000" />
-      <workItem from="1757316632985" duration="5726000" />
-      <workItem from="1757398507990" duration="14164000" />
-      <workItem from="1757416690412" duration="9000" />
-      <workItem from="1757467771700" duration="21260000" />
-      <workItem from="1757553733107" duration="4459000" />
-      <workItem from="1757917072134" duration="3382000" />
-      <workItem from="1758007839529" duration="5531000" />
-      <workItem from="1758077881855" duration="18021000" />
-      <workItem from="1758103406536" duration="617000" />
-      <workItem from="1758180322036" duration="1916000" />
-      <workItem from="1759212166724" duration="206000" />
-      <workItem from="1760151950417" duration="2232000" />
-      <workItem from="1760169229571" duration="14000" />
-      <workItem from="1760339218907" duration="443000" />
-      <workItem from="1760510226604" duration="1312000" />
-      <workItem from="1760578193300" duration="7757000" />
-      <workItem from="1760597553571" duration="802000" />
-      <workItem from="1761531403616" duration="1203000" />
-      <workItem from="1761638698577" duration="342000" />
-      <workItem from="1761639047067" duration="183000" />
-      <workItem from="1761639235507" duration="2039000" />
-      <workItem from="1761701265111" duration="15074000" />
-      <workItem from="1761742885290" duration="2696000" />
-      <workItem from="1761791975226" duration="6738000" />
-      <workItem from="1761876184822" duration="2585000" />
-      <workItem from="1761884944240" duration="1365000" />
-      <workItem from="1761963205868" duration="76000" />
-      <workItem from="1761974366859" duration="7405000" />
-      <workItem from="1761998258387" duration="4266000" />
-      <workItem from="1762049288073" duration="7341000" />
-      <workItem from="1762077934548" duration="7000" />
-      <workItem from="1762140860471" duration="6000" />
-      <workItem from="1762148761093" duration="2864000" />
-      <workItem from="1762407324740" duration="352000" />
-      <workItem from="1762408940648" duration="2306000" />
-      <workItem from="1762758018400" duration="2147000" />
-      <workItem from="1762918136241" duration="599000" />
-      <workItem from="1763022824087" duration="623000" />
-      <workItem from="1763090697888" duration="1271000" />
-      <workItem from="1763172694665" duration="2616000" />
-      <workItem from="1763189413702" duration="2862000" />
-      <workItem from="1763196084805" duration="853000" />
-      <workItem from="1764557389891" duration="2278000" />
-      <workItem from="1764637683554" duration="8000" />
-      <workItem from="1764736985721" duration="456000" />
-      <workItem from="1764737603049" duration="3120000" />
-      <workItem from="1764817167366" duration="732000" />
-      <workItem from="1764919478024" duration="7000" />
-      <workItem from="1766050234568" duration="628000" />
-      <workItem from="1766107126546" duration="2001000" />
-      <workItem from="1767607591753" duration="654000" />
-      <workItem from="1767662632796" duration="10249000" />
-      <workItem from="1767751120694" duration="354000" />
-      <workItem from="1767751483688" duration="31000" />
-      <workItem from="1767751525959" duration="393000" />
-      <workItem from="1768033250262" duration="599000" />
-      <workItem from="1768480967449" duration="7522000" />
-    </task>
-    <task id="LOCAL-00001" summary="更新">
-      <option name="closed" value="true" />
-      <created>1755570571986</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1755570571986</updated>
-    </task>
-    <task id="LOCAL-00002" summary="更新">
-      <option name="closed" value="true" />
-      <created>1755653351515</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1755653351515</updated>
-    </task>
-    <task id="LOCAL-00003" summary="更新">
-      <option name="closed" value="true" />
-      <created>1756986753513</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1756986753513</updated>
-    </task>
-    <task id="LOCAL-00004" summary="更新">
-      <option name="closed" value="true" />
-      <created>1756988475412</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1756988475412</updated>
-    </task>
-    <task id="LOCAL-00005" summary="添加权限验证">
-      <option name="closed" value="true" />
-      <created>1757558231641</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1757558231641</updated>
-    </task>
-    <task id="LOCAL-00006" summary="添加权限验证">
-      <option name="closed" value="true" />
-      <created>1757927853303</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1757927853303</updated>
-    </task>
-    <task id="LOCAL-00007" summary="添加告警信息记录">
-      <option name="closed" value="true" />
-      <created>1758103172970</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1758103172970</updated>
-    </task>
-    <task id="LOCAL-00008" summary="添加路由token验证">
-      <option name="closed" value="true" />
-      <created>1760597945204</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1760597945204</updated>
-    </task>
-    <task id="LOCAL-00009" summary="一些调整和数据源改成DM">
-      <option name="closed" value="true" />
-      <created>1761742752439</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1761742752439</updated>
-    </task>
-    <task id="LOCAL-00010" summary="修改配置">
-      <option name="closed" value="true" />
-      <created>1761743052064</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1761743052064</updated>
-    </task>
-    <task id="LOCAL-00011" summary="修改token请求方法，解决数据中台访问报错问题">
-      <option name="closed" value="true" />
-      <created>1761800505662</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1761800505662</updated>
-    </task>
-    <task id="LOCAL-00012" summary="修改token请求方法，解决数据中台访问报错问题">
-      <option name="closed" value="true" />
-      <created>1762077910796</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1762077910796</updated>
-    </task>
-    <option name="localTasksCounter" value="13" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="更新" />
-    <MESSAGE value="添加权限验证" />
-    <MESSAGE value="添加告警信息记录" />
-    <MESSAGE value="添加路由token验证" />
-    <MESSAGE value="一些调整和数据源改成DM" />
-    <MESSAGE value="修改配置" />
-    <MESSAGE value="修改token请求方法，解决数据中台访问报错问题" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改token请求方法，解决数据中台访问报错问题" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/ApiAuthFilter.java</url>
-          <line>36</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/AuthFilter.java</url>
-          <line>30</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/RequestLogGlobalFilter.java</url>
-          <line>28</line>
-          <option name="timeStamp" value="3" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/ResponseLogGlobalFilter.java</url>
-          <line>52</line>
-          <option name="timeStamp" value="4" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/cn/com/goldenwater/filter/ThirdPartyAuthFilter.java</url>
-          <line>38</line>
-          <option name="timeStamp" value="5" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-    <watches-manager>
-      <configuration name="SpringBootApplicationConfigurationType">
-        <watch expression="              // 记录写操作审计日志&#10;                    if (isWriteOperation(method)) {&#10;                        auditService.logWriteOperation(thirdPartyId, path, method, request);&#10;                    }" />
-      </configuration>
-    </watches-manager>
-  </component>
-</project>

src/main/java/cn/com/goldenwater/repository/JdbcRouteDefinitionRepository.java

@@ -81,7 +81,6 @@ public class JdbcRouteDefinitionRepository implements RouteDefinitionRepository
             try {
                 log.info("尝试保存路由定义: ID={}, URI={}, Predicates={}, Filters={}",
                         r.getId(), r.getUri(), r.getPredicates(), r.getFilters());
-                
                 GatewayRoutes gatewayRoutes = new GatewayRoutes();
                 gatewayRoutes.setId(r.getId());
                 gatewayRoutes.setUri(r.getUri().toString());
@@ -89,16 +88,16 @@ public class JdbcRouteDefinitionRepository implements RouteDefinitionRepository
                 gatewayRoutes.setFilters(JsonUtils.objectToJson(r.getFilters()));
                 gatewayRoutes.setStatus("0"); // 默认设置为启用状态
                 
-                // 检查路由是否已存在
-                if (gatewayRoutesService.getById(r.getId()) != null) {
-                    // 路由已存在，执行更新操作
-                    log.info("路由定义已存在，执行更新操作: ID={}", r.getId());
-                    gatewayRoutesService.updateById(gatewayRoutes);
-                } else {
-                    // 路由不存在，执行插入操作
-                    log.info("路由定义不存在，执行插入操作: ID={}", r.getId());
-                    gatewayRoutesService.save(gatewayRoutes);
-                }
+//                // 检查路由是否已存在
+//                if (gatewayRoutesService.getById(r.getId()) != null) {
+//                    // 路由已存在，执行更新操作
+//                    log.info("路由定义已存在，执行更新操作: ID={}", r.getId());
+//                    gatewayRoutesService.updateById(gatewayRoutes);
+//                } else {
+//                    // 路由不存在，执行插入操作
+//                    log.info("路由定义不存在，执行插入操作: ID={}", r.getId());
+//                    gatewayRoutesService.save(gatewayRoutes);
+//                }
                 
                 log.info("路由定义保存成功: ID={}", r.getId());
                 return Mono.empty();

src/main/resources/logback-spring.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds">
+
+    <!-- 控制台输出 -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 文件输出 -->
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/gateway.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>logs/gateway.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 日志级别 -->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE"/>
+    </root>
+
+    <!-- 特定包的日志级别 -->
+    <logger name="cn.com.goldenwater" level="DEBUG"/>
+    <logger name="org.springframework.cloud.gateway" level="DEBUG"/>
+    <logger name="org.springframework.web.reactive" level="DEBUG"/>
+    <logger name="org.springframework.data.redis" level="INFO"/>
+
+</configuration>