智慧保安后台管理-外网项目备份
zhongrj
2023-02-21 7069c80e28f86bca44bcd060b865f8e719ad634e
数据同步配置修改
6 files modified
50 ■■■■ changed files
src/main/java/org/springblade/common/config/DataSyncConfig.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/controller/UserController.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/service/MyAsyncService.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 1 ●●●● patch | view | raw | blame | history
src/main/resources/application-prod.yml 35 ●●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/config/DataSyncConfig.java
@@ -13,6 +13,11 @@
public class DataSyncConfig {
    /**
     * 是否开启
     */
    public static String enable;
    /**
     * 同步类型: ftp,sql
     */
    public static String type;
@@ -37,6 +42,10 @@
     */
    public static String password;
    public void setEnable(String enable) {
        DataSyncConfig.enable = enable;
    }
    public void setType(String type) {
        DataSyncConfig.type = type;
    }
src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -212,7 +212,9 @@
    @ApiOperation(value = "列表", notes = "传入account和realName")
    //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
    public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
        System.out.println("在线更新代码.... ");
        IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
        System.out.println("=================在线更新代码==================");
        return R.data(pages);
    }
src/main/java/org/springblade/modules/system/service/MyAsyncService.java
@@ -167,6 +167,7 @@
     */
    @Async
    public void dataSync(String sql) {
        if (DataSyncConfig.enable.equals("start")) {
        //判断同步类型
        //sql 直连处理
        if (DataSyncConfig.type.equals("sql")) {
@@ -178,6 +179,7 @@
            FTP(sql);
        }
    }
    }
    /**
     *  sql 直连处理
src/main/resources/application-dev.yml
@@ -71,6 +71,7 @@
# 数据同步配置
data:
  sync:
    enable: start
    type: sql
    driver: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
src/main/resources/application-prod.yml
@@ -24,9 +24,9 @@
  datasource:
    # MySql
    url: jdbc:mysql://192.168.0.191:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://106.225.193.35:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: root
    password: HCyj@2022
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
@@ -44,29 +44,39 @@
#图片批量上传zip
upload:
  localtion: ${UPLOAD_DIR:/home/zhbaw/anbao}
  localtion: ${UPLOAD_DIR:/home/zhongsong/anbao}
  maxFileSize: 10240KB
  maxRequestSize: 102400KB
  url: http://47.49.36.190:9000
  access: minioadmin
  secret: minioadmin
  url: http://106.225.193.35:2081
  access: zhbaadmin
  secret: zhbapassword
  bucket: zhba
#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  sqlConnect: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 117.40.91.118
  ftpPort: 21
  ftpUserName: zhbain
  ftpPassword: zhbain@123
  ftpPath: yly/anbao/
  localPath: /home/zhbaw/anbao/
  ip: http://47.49.36.190:9000
  jsonUrl: /home/zhbaw/anbao/
  localPath: /home/zhongsong/anbao/
  ip: http://106.225.193.35:2081
  jsonUrl: /home/zhongsong/anbao/
  username: root
  password: ZHba@0112
  password: NCzhba@2022
  #  qfqkBaseApiUrl: http://61.131.136.25:2082/api
  qfqkBaseApiUrl: http://localhost:83
# 数据同步配置
data:
  sync:
    enable: stop
    type: sql
    driver: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://106.225.193.35:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: NCzhba@2022
#第三方登陆
social:
@@ -86,3 +96,6 @@
    remote-mode: true
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html
src/main/resources/application-test.yml
@@ -75,6 +75,7 @@
# 数据同步配置
data:
  sync:
    enable: stop
    type: sql
    driver: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.0.126:3306/zhba-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true