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 0000000..9fd7aae Binary files /dev/null and b/ruoyi-ui/src/assets/logo/xy_logo.png differ 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 @@ @@ -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; }