From 336446076a271cbbb0df0dacb89225df288a0642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?=
 <7374215+wanli_yang@user.noreply.gitee.com>
Date: Wed, 8 Feb 2023 09:06:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-druid.yml     |   6 +++---
 .../basetyre/controller/BaseTyreController.java  |   4 ++++
 ruoyi-ui/src/assets/logo/xy_logo.png             | Bin 0 -> 3328 bytes
 ruoyi-ui/src/layout/components/Sidebar/Logo.vue  |   8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-ui/src/assets/logo/xy_logo.png

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ac31ab2..c44d91b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=XY_SMART_TIRE;trustServerCertificate=true
-                username: sa
-                password: haiwei@123
+                url: jdbc:sqlserver://172.16.251.187:1433;SelectMethod=cursor;DatabaseName=XY_SMART_TIRE
+                username: DNC
+                password: dnc
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java
index ecc92ef..3bd3aa3 100644
--- a/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java
+++ b/ruoyi-basetyre/src/main/java/com/ruoyi/basetyre/controller/BaseTyreController.java
@@ -101,4 +101,8 @@ public class BaseTyreController extends BaseController
     {
         return toAjax(baseTyreService.deleteBaseTyreByIds(ids));
     }
+
+    public static void main(String[] args) {
+        System.out.println();
+    }
 }
diff --git a/ruoyi-ui/src/assets/logo/xy_logo.png b/ruoyi-ui/src/assets/logo/xy_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fd7aae5893b59256b7c83e42d1de76df762ba82
GIT binary patch
literal 3328
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
index 934d13d..3a3801c 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue
@@ -15,7 +15,7 @@
 
 <script setup>
 import variables from '@/assets/styles/variables.module.scss'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/xy_logo.png'
 import useSettingsStore from '@/store/modules/settings'
 
 defineProps({
@@ -25,7 +25,7 @@ defineProps({
   }
 })
 
-const title = ref('若依管理系统');
+// const title = ref('若依管理系统');
 const settingsStore = useSettingsStore();
 const sideTheme = computed(() => settingsStore.sideTheme);
 </script>
@@ -54,8 +54,8 @@ const sideTheme = computed(() => settingsStore.sideTheme);
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 216px;
+      height: 80px;
       vertical-align: middle;
       margin-right: 12px;
     }