Merge remote-tracking branch 'origin/master'

刘小明

2024-08-13 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pms-parent/pms-global/src/main/resources/application-database.yml

 pms-parent/pms-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java

@@ -21,11 +21,11 @@
    }

    public static BaseResponse buildToLogin(){
        return buildResult(ResultCodeMsg.RsCode.TOLOGIN_CODE, ResultCodeMsg.RsMsg.TOLOGIN_MESSAGE, null);
        return buildResult(ResultCodeMsg.RsCode.TOLOGIN_CODE, ResultCodeMsg.RsMsg.TOLOGIN_MESSAGE, ResultCodeMsg.RsMsg.TOLOGIN_MESSAGE);
    }

    public static BaseResponse buildNoPower(){
        return buildResult(ResultCodeMsg.RsCode.NOPOWER_CODE, ResultCodeMsg.RsMsg.NOPOWER_MESSAGE, null);
        return buildResult(ResultCodeMsg.RsCode.NOPOWER_CODE, ResultCodeMsg.RsMsg.NOPOWER_MESSAGE, ResultCodeMsg.RsMsg.NOPOWER_MESSAGE);
    }

    public static BaseResponse buildException(String message){

 pms-parent/pms-global/src/main/resources/application-database.yml

@@ -3,7 +3,7 @@
    datasource: #配置数据源
        type: com.alibaba.druid.pool.DruidDataSource
        driver-class-name: com.mysql.cj.jdbc.Driver
        url: jdbc:mysql://8.130.75.203:3306/pms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        url: jdbc:mysql://127.0.0.1:3306/pms?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
        username: root
        password: dysql,;.abc!@#
        druid:

 pms-parent/pms-global/src/main/resources/application-global.yml

@@ -119,8 +119,8 @@
            hashStart: 0
            hashEnd: 5461
            restUrl: http://127.0.0.1:${pms.file1.webPort}/file #file是上下文
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/ #nginx服务路径，安装部署时IP改成外网IP或域名
            webDownloadPath: http://127.0.0.1:${pms.file1.webPort}/file/download/down?id= #安装部署时IP改成外网IP或域名
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/ #nginx服务路径
            webDownloadPath: /download/down?id=  #实际下载webUrl= restUrl + webDownloadPath
        sv2:
            id: dyFile2
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -128,8 +128,8 @@
            hashStart: 5462
            hashEnd: 10923
            restUrl: http://127.0.0.1:${pms.file2.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file2.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv3:
            id: dyFile3
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -137,8 +137,8 @@
            hashStart: 10924
            hashEnd: 16385
            restUrl: http://127.0.0.1:${pms.file3.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file3.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv4:
            id: dyFile4
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -146,8 +146,8 @@
            hashStart: 16386
            hashEnd: 21847
            restUrl: http://127.0.0.1:${pms.file4.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file4.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv5:
            id: dyFile5
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -155,8 +155,8 @@
            hashStart: 21848
            hashEnd: 27309
            restUrl: http://127.0.0.1:${pms.file5.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file5.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv6:
            id: dyFile6
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -164,8 +164,8 @@
            hashStart: 27310
            hashEnd: 32767
            restUrl: http://127.0.0.1:${pms.file6.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file6.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv7:
            id: dyFile7
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -173,8 +173,8 @@
            hashStart: 32768
            hashEnd: 38229
            restUrl: http://127.0.0.1:${pms.file7.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file7.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv8:
            id: dyFile8
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -182,8 +182,8 @@
            hashStart: 38230
            hashEnd: 43691
            restUrl: http://127.0.0.1:${pms.file8.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file8.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv9:
            id: dyFile9
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -191,8 +191,8 @@
            hashStart: 43692
            hashEnd: 49153
            restUrl: http://127.0.0.1:${pms.file9.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file9.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv10:
            id: dyFile10
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -200,8 +200,8 @@
            hashStart: 49154
            hashEnd: 54615
            restUrl: http://127.0.0.1:${pms.file10.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file10.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv11:
            id: dyFile11
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -209,8 +209,8 @@
            hashStart: 54616
            hashEnd: 60077
            restUrl: http://127.0.0.1:${pms.file11.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file11.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=
        sv12:
            id: dyFile12
            absolutePath: D:/apps/pms/nginx/nginx-1.24.0/html/webfiles/
@@ -218,5 +218,5 @@
            hashStart: 60078
            hashEnd: 65535
            restUrl: http://127.0.0.1:${pms.file12.webPort}/file
            webUrl: http://127.0.0.1:${pms.nginx.webPort}/webfiles/
            webDownloadPath: http://127.0.0.1:${pms.file12.webPort}/file/download/down?id=
            webUrl: http://8.130.75.203:${pms.nginx.webPort}/webfiles/
            webDownloadPath: /download/down?id=

 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml

@@ -76,7 +76,6 @@
    select
      count(*)
    from ba_user
    where  deleted!=1
  </select>
  <select id="login" resultMap="loginResultMap" >
    select