diff --git a/pom.xml b/pom.xml
index 1a1a513..5016d24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,6 +185,11 @@
ruoyi-common
${ruoyi.version}
+
+ com.ruoyi
+ ruoyi-basetyre
+ ${ruoyi.version}
+
@@ -196,6 +201,7 @@
ruoyi-quartz
ruoyi-generator
ruoyi-common
+ ruoyi-basetyre
pom
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 1e7cff5..fae5575 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -67,6 +67,12 @@
ruoyi-generator
+
+
+ com.ruoyi
+ ruoyi-basetyre
+
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index 32eb6f1..4280bfb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -16,15 +16,13 @@ public class RuoYiApplication
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
- System.out.println("(♥◠‿◠)ノ゙ 若依启动成功 ლ(´ڡ`ლ)゙ \n" +
- " .-------. ____ __ \n" +
- " | _ _ \\ \\ \\ / / \n" +
- " | ( ' ) | \\ _. / ' \n" +
- " |(_ o _) / _( )_ .' \n" +
- " | (_,_).' __ ___(_ o _)' \n" +
- " | |\\ \\ | || |(_,_)' \n" +
- " | | \\ `' /| `-' / \n" +
- " | | \\ / \\ / \n" +
- " ''-' `'-' `-..-' ");
+ System.out.println(" _ _ _ \n" +
+ "| | (_) | | \n" +
+ "| |__ _ __ _| |__ __ ____ _ _ _ \n" +
+ "| '_ \\| |/ _` | '_ \\ \\ \\ /\\ / / _` | | | |\n" +
+ "| | | | | (_| | | | | \\ V V / (_| | |_| |\n" +
+ "|_| |_|_|\\__, |_| |_| \\_/\\_/ \\__,_|\\__, |\n" +
+ " __/ | __/ |\n" +
+ " |___/ |___/");
}
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 71ffa96..ac31ab2 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=XY_SMART_TIRE
+ url: jdbc:sqlserver://121.36.58.109:1433;SelectMethod=cursor;DatabaseName=XY_SMART_TIRE;trustServerCertificate=true
username: sa
password: haiwei@123
# 从库数据源
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt
index 0931cb8..220aafd 100644
--- a/ruoyi-admin/src/main/resources/banner.txt
+++ b/ruoyi-admin/src/main/resources/banner.txt
@@ -1,24 +1,3 @@
Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 佛祖保佑 永不宕机 永无BUG //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file
+ 雄鹰轮胎
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index a4c64a0..6dbb959 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -72,7 +72,7 @@
删除
diff --git a/ruoyi-ui/vite.config.js b/ruoyi-ui/vite.config.js
index 22c9287..2b6f847 100644
--- a/ruoyi-ui/vite.config.js
+++ b/ruoyi-ui/vite.config.js
@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api': {
- target: 'http://10.11.41.249:8080',
+ target: 'http://localhost:8080',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
}