From 7ade5c3c8887289f376c4f8ac918bd0fe60fcf21 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 15 Jan 2024 11:01:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xydl/cac/interceptor/GateWayInterceptor.java   | 6 +++---
 .../java/com/xydl/cac/service/impl/DataServiceImpl.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/xydl/cac/interceptor/GateWayInterceptor.java b/src/main/java/com/xydl/cac/interceptor/GateWayInterceptor.java
index 3d7d25b..ae4f59a 100644
--- a/src/main/java/com/xydl/cac/interceptor/GateWayInterceptor.java
+++ b/src/main/java/com/xydl/cac/interceptor/GateWayInterceptor.java
@@ -1,14 +1,14 @@
 package com.xydl.cac.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Enumeration;
 
 @Slf4j
-public class GateWayInterceptor extends HandlerInterceptorAdapter {
+public class GateWayInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -19,7 +19,7 @@ public class GateWayInterceptor extends HandlerInterceptorAdapter {
             str.append(", ").append(paramName).append("=").append(request.getParameter(paramName));
         }
         log.info(str.toString());
-        return super.preHandle(request, response, handler);
+        return true;
     }
 
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
index c628c15..5da59e4 100644
--- a/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/DataServiceImpl.java
@@ -63,7 +63,7 @@ public class DataServiceImpl implements DataService {
 
         List<ColumnModel> result = new ArrayList<>();
         String sql = "SELECT COLUMN_NAME name, COLUMN_COMMENT comment FROM information_schema.columns WHERE TABLE_NAME='"
-                + tableName + "' AND TABLE_SCHEMA='" + schema + "' ORDER BY comment,name";
+                + tableName + "' AND TABLE_SCHEMA='" + schema + "' ORDER BY name,comment";
         List<ColumnModel> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ColumnModel.class));
         for (ColumnModel item : list) {
             String col = item.getName();