Merge branch 'dock' into hnzxyjhyy

ruisi_java/ruisi-web-admin/src/main/resources/application-stage.yml

@@ -88,7 +88,7 @@ app:
   # 资源访问路径前缀 示例（/profile）
   profileUrl: /profile
   # 资源存储路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profilePath: /home/ruisiCga/server/profile
+  profilePath: D:/Projects/ruisi_cga/server/profile/
   # 分布式ID-WorkID
   workerId: 1
   # 分布式ID-DataCenterID

ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
 #        password: po3OynBO[M3579p6L7)o
         url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: q7510327
+        password: 123456
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭