From 8830ba292d20bf0a90052d123e4595a7eaeebe27 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 30 八月 2024 20:19:41 +0800 Subject: [PATCH] bug --- ycl-server/src/main/resources/application.yml | 18 ++++++++ ycl-server/src/main/resources/application-prod.yml | 19 --------- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 2 ycl-server/src/main/resources/application-dev.yml | 51 +++++++++++++------------ 4 files changed, 44 insertions(+), 46 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 3702630..06ca137 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -694,7 +694,7 @@ imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png"; // 鐢熸垚鍥剧墖璺緞 - String imgPath = PlatformConfig.getUploadPath() + "/" + imgUrl; + String imgPath = PlatformConfig.getProfile() + "/" + imgUrl; System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath); imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl; // 淇濆瓨鍥剧墖 diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml index cd60f78..a15ef85 100644 --- a/ycl-server/src/main/resources/application-dev.yml +++ b/ycl-server/src/main/resources/application-dev.yml @@ -1,3 +1,23 @@ +# 寮�鍙戠幆澧冮厤缃� +server: + # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 + port: 8085 + servlet: + # 搴旂敤鐨勮闂矾寰� + context-path: / + tomcat: + # tomcat鐨刄RI缂栫爜 + uri-encoding: UTF-8 + # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 + accept-count: 1000 + threads: + # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 + max: 800 + # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 + min-spare: 100 + + + # 椤圭洰鐩稿叧閰嶇疆 platform: # 鍚嶇О @@ -14,31 +34,12 @@ captchaType: math -# 寮�鍙戠幆澧冮厤缃� -server: - # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8080 - servlet: - # 搴旂敤鐨勮闂矾寰� - context-path: / - tomcat: - # tomcat鐨刄RI缂栫爜 - uri-encoding: UTF-8 - # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 - accept-count: 1000 - threads: - # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 - max: 800 - # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 - min-spare: 100 - - spring: # 鏁版嵁婧愰厤缃� datasource: - url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root - password: ycl@202466 + password: 123456 type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver @@ -76,11 +77,11 @@ spring.data: redis: # 鍦板潃 - host: 42.193.1.25 -# host: 127.0.0.1 +# host: 42.193.1.25 + host: 127.0.0.1 # 绔彛锛岄粯璁や负6379 port: 6379 - password: ycl2018 +# password: ycl2018 # password: # 鏁版嵁搴撶储寮� database: 0 @@ -125,7 +126,7 @@ spring: data: mongodb: - uri: mongodb://root1:yunwei%402024@192.168.3.88:27017/zgyw?authSource=admin + uri: mongodb://root1:yunwei%402024@127.0.0.1:27017/zgyw?authSource=admin # 鎷夊彇鏁版嵁璇锋眰閰嶇疆 request: diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml index 8185247..ebb13b0 100644 --- a/ycl-server/src/main/resources/application-prod.yml +++ b/ycl-server/src/main/resources/application-prod.yml @@ -14,25 +14,6 @@ captchaType: math -# 寮�鍙戠幆澧冮厤缃� -server: - # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 - port: 8085 - servlet: - # 搴旂敤鐨勮闂矾寰� - context-path: /zgyw - tomcat: - # tomcat鐨刄RI缂栫爜 - uri-encoding: UTF-8 - # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 - accept-count: 1000 - threads: - # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 - max: 800 - # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 - min-spare: 100 - - spring: # 鏁版嵁婧愰厤缃� datasource: diff --git a/ycl-server/src/main/resources/application.yml b/ycl-server/src/main/resources/application.yml index 7473044..e7c9453 100644 --- a/ycl-server/src/main/resources/application.yml +++ b/ycl-server/src/main/resources/application.yml @@ -1,4 +1,20 @@ - +# 寮�鍙戠幆澧冮厤缃� +server: + # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080 + port: 8080 + servlet: + # 搴旂敤鐨勮闂矾寰� + context-path: / + tomcat: + # tomcat鐨刄RI缂栫爜 + uri-encoding: UTF-8 + # 杩炴帴鏁版弧鍚庣殑鎺掗槦鏁帮紝榛樿涓�100 + accept-count: 1000 + threads: + # tomcat鏈�澶х嚎绋嬫暟锛岄粯璁や负200 + max: 800 + # Tomcat鍚姩鍒濆鍖栫殑绾跨▼鏁帮紝榛樿鍊�10 + min-spare: 100 spring: # 璧勬簮淇℃伅 -- Gitblit v1.8.0