bihuisong 14 hours ago
parent
commit
6f37fda3ab

+ 9 - 4
ruoyi-admin/src/main/resources/application-druid.yml

@@ -4,11 +4,16 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
-            # 主库数据源
+#            # 主库数据源
+#            master:
+#                url: jdbc:mysql://localhost:3306/jl_visual_monitor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: root
+            # 本地库数据源
             master:
-                url: jdbc:mysql://localhost:3306/jl_visual_monitor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: root
+                url: jdbc:mysql://192.168.10.15:63306/jl_visual_monitor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: sooka
+                password: sooka1a2b3c4d%...
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

+ 1 - 1
ruoyi-admin/src/main/resources/templates/main.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--360浏览器优先以webkit内核解析-->
     <title>介绍</title>
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" th:href="@{favicon.ico}">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.min.css" th:href="@{/css/style.min.css}" rel="stylesheet"/>

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/ColumnPageViewMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectColumnPageViewList" parameterType="ColumnPageView" resultMap="ColumnPageViewResult">
         <include refid="selectColumnPageViewVo"/>
-        order by column_ranking asc
+        order by CONVERT(column_ranking, SIGNED)
     </select>
 
 	<delete id="deleteColumnPageViewAll" parameterType="Long">

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/CountyDailyTrafficRankingMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCountyDailyTrafficRankingList" parameterType="CountyDailyTrafficRanking" resultMap="CountyDailyTrafficRankingResult">
         <include refid="selectCountyDailyTrafficRankingVo"/>
-        order by ranking asc
+        order by CONVERT(ranking, SIGNED)
     </select>
 
 	<delete id="deleteCountyDailyTrafficRankingAll" parameterType="Long">

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/CountyDailyUpdateRankingMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCountyDailyUpdateRankingList" parameterType="CountyDailyUpdateRanking" resultMap="CountyDailyUpdateRankingResult">
         <include refid="selectCountyDailyUpdateRankingVo"/>
-        order by ranking asc
+        order by CONVERT(ranking, SIGNED)
     </select>
 
 	<delete id="deleteCountyDailyUpdateRankingAll" parameterType="Long">

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/DailyTrafficRankingMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDailyTrafficRankingList" parameterType="DailyTrafficRanking" resultMap="DailyTrafficRankingResult">
         <include refid="selectDailyTrafficRankingVo"/>
-        order by ranking asc
+        order by CONVERT(ranking, SIGNED)
     </select>
 
 	<delete id="deleteDailyTrafficRankingAll" parameterType="Long">

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/DailyUpdateRankingMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDailyUpdateRankingList" parameterType="DailyUpdateRanking" resultMap="DailyUpdateRankingResult">
         <include refid="selectDailyUpdateRankingVo"/>
-        order by ranking asc
+        order by CONVERT(ranking, SIGNED)
     </select>
 
 	<delete id="deleteDailyUpdateRankingAll" parameterType="Long">

+ 1 - 0
ruoyi-system/src/main/resources/mapper/system/PopularInformationMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPopularInformationList" parameterType="PopularInformation" resultMap="PopularInformationResult">
         <include refid="selectPopularInformationVo"/>
+        order by CONVERT(popular_ranking, SIGNED)
     </select>
 
 	<delete id="deletePopularInformationAll" parameterType="Long">