Merge remote-tracking branch 'origin/v0.1' into v0.1

application-webadmin/src/main/java/com/tourism/webadmin/back/model/BannerInfo.java

@@ -56,7 +56,7 @@ public class BannerInfo extends BaseModel {
     /**
      * 图片URL。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "img_url")
     private String imgUrl;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/model/JobFile.java

@@ -47,7 +47,7 @@ public class JobFile extends BaseModel {
     /**
      * 文件存储地址。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "file_url")
     private String fileUrl;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/model/JobProject.java

@@ -123,7 +123,7 @@ public class JobProject extends BaseModel {
     /**
      * 劳务图片。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "job_url")
     private String jobUrl;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/model/SysUserWeb.java

@@ -50,7 +50,7 @@ public class SysUserWeb extends BaseModel {
     /**
      * 用户头像的Url。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "head_image_url")
     private String headImageUrl;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismFile.java

@@ -47,7 +47,7 @@ public class TourismFile extends BaseModel {
     /**
      * 文件存储地址。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "file_url")
     private String fileUrl;
 

application-webadmin/src/main/java/com/tourism/webadmin/back/model/TourismProject.java

@@ -98,7 +98,7 @@ public class TourismProject extends BaseModel {
     /**
      * 项目展示图片。
      */
-    @UploadFlagColumn(storeType = UploadStoreTypeEnum.LOCAL_SYSTEM)
+    @UploadFlagColumn(storeType = UploadStoreTypeEnum.HUAWEI_OBS_SYSTEM)
     @TableField(value = "tourism_url")
     private String tourismUrl;
 

application-webadmin/src/main/resources/application-dev.yml

@@ -8,27 +8,27 @@ spring:
     druid:
       # 数据库链接 [主数据源]
       main:
-        url: jdbc:mysql://192.168.1.204:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://localhost:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: lm8458
       # 默认生成的操作日志数据源配置。
       operation-log:
-        url: jdbc:mysql://192.168.1.204:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://localhost:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: lm8458
       # 默认生成的全局编码字典数据源配置。
       global-dict:
-        url: jdbc:mysql://192.168.1.204:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://localhost:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: lm8458
       # 默认生成的工作流及在线表单数据源配置。
       common-flow-online:
-        url: jdbc:mysql://192.168.1.204:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://localhost:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: lm8458
       # 默认生成的统计打印模块的数据源配置。
       common-report:
-        url: jdbc:mysql://192.168.1.204:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://localhost:3306/tourism?characterEncoding=utf8&useSSL=true&serverTimezone=Asia/Shanghai
         username: root
         password: lm8458
       driverClassName: com.mysql.cj.jdbc.Driver

application-webadmin/src/main/resources/application-prod.yml

@@ -199,7 +199,7 @@ sa-token:
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
-    password:
+    password: 1234qwer
     # 连接超时时间
     timeout: 10s
   is-read-header: true