配置文件修改

springboot/wumei-admin/src/main/resources/application-druid.yml

@@ -8,13 +8,7 @@ spring:
       master:
         url: jdbc:mysql://localhost/wumei-smart?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-<<<<<<< HEAD
-                password: root
-#                password: 123456
-=======
-                password: wumei-smart
-            #                password: 123456
->>>>>>> 45a497af97959ef44d9172185e2ab1883a4fa25d
+        password: admin
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

springboot/wumei-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/wumei-smart/uploadPath，Linux配置 /var/wumei-smart/java/uploadPath）
-  profile: D:/wumei-smart/uploadPath
+  profile: /var/wumei-smart/java/uploadPath
   # 获取ip地址开关
   addressEnabled: true
   # 验证码类型 math 数组计算 char 字符验证
@@ -65,8 +65,7 @@ spring:
     # 数据库索引
     database: 0
     # 密码
-    #    password: wumei-smart
-    #    password: 123456
+    password: wumei-smart
     # 连接超时时间
     timeout: 10s
     lettuce: