From 9bfdf1ff20086c04bbe6576706bfee95c9d7fea0 Mon Sep 17 00:00:00 2001 From: 刘小明 <liuxm_a@163.com> Date: 星期二, 13 八月 2024 10:46:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 1 - pms-parent/pms-global/src/main/resources/application-database.yml | 2 +- pms-parent/pms-global/src/main/resources/application-global.yml | 48 ++++++++++++++++++++++++------------------------ pms-parent/pms-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java | 4 ++-- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java b/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java index 64d0dda..245bb9f 100644 --- a/pms-parent/pms-common/src/main/java/com/dy/common/webUtil/BaseResponseUtils.java +++ b/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){ diff --git a/pms-parent/pms-global/src/main/resources/application-database.yml b/pms-parent/pms-global/src/main/resources/application-database.yml index 49bd024..896aa10 100644 --- a/pms-parent/pms-global/src/main/resources/application-database.yml +++ b/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: diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml index f2dcd80..abccfb8 100644 --- a/pms-parent/pms-global/src/main/resources/application-global.yml +++ b/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= #瀹夎閮ㄧ讲鏃禝P鏀规垚澶栫綉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= diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml index 9ebda5d..c4807ed 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml +++ b/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 -- Gitblit v1.8.0