From 6ea3d5caa30f460f1eb9c3880d90f41275c3c274 Mon Sep 17 00:00:00 2001 From: yangyang Date: 星期四, 03 七月 2025 09:25:08 +0800 Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev --- zy-asrs-wms/src/main/resources/application.yml | 126 ++++++++++++++++++++++++++++------------- 1 files changed, 85 insertions(+), 41 deletions(-) diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml index bab83ef..0085485 100644 --- a/zy-asrs-wms/src/main/resources/application.yml +++ b/zy-asrs-wms/src/main/resources/application.yml @@ -1,41 +1,85 @@ -server: - port: 8081 - servlet: - context-path: /@pom.build.finalName@ - -spring: - application: - name: @pom.build.finalName@ - jmx: - enabled: false - datasource: - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - #url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs - url: jdbc:sqlserver://localhost:1433;databasename=jmasrs - username: sa - password: sa@123 - mvc: - static-path-pattern: /** - servlet: - multipart: - maxFileSize: 100MB - maxRequestSize: 100MB - -mybatis-plus: - mapper-locations: classpath:mapper/*.xml - # global-config: - # field-strategy: 0 - configuration: - # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - map-underscore-to-camel-case: true - cache-enabled: true - global-config: - :banner: false - db-config: - id-type: auto - logic-delete-value: 1 - logic-not-delete-value: 0 - -logging: - file: - path: /stock/out/@pom.build.finalName@/logs \ No newline at end of file +server: + port: 8081 + servlet: + context-path: /@pom.build.finalName@ + +spring: + application: + name: @pom.build.finalName@ + jmx: + enabled: false + datasource: + hikari: + validation-timeout: 3000 + connection-test-query: select 1 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +# url: jdbc:mysql://127.0.0.1:3306/ycdsasrs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + username: root + password: 34821015 +# url: jdbc:mysql://47.76.147.249:3306/wms_dev_test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +# username: wms_dev_test +# password: smjPbTrkmTMEGKaD +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# url: jdbc:sqlserver://47.97.1.152:51433;databasename=jkasrs +# username: sa +# password: Zoneyung@zy56$ + mvc: + static-path-pattern: /** + servlet: + multipart: + maxFileSize: 100MB + maxRequestSize: 100MB + redis: + host: 127.0.0.1 + port: 6379 + database: 6 + # password: 123456 + +mybatis-plus: + mapper-locations: classpath:mapper/*/*.xml + # global-config: + # field-strategy: 0 + configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + map-underscore-to-camel-case: true + cache-enabled: true + global-config: + :banner: false + db-config: + id-type: auto + logic-delete-value: 1 + logic-not-delete-value: 0 + +logging: + file: + path: /stock/out/@pom.build.finalName@/logs + +super: + pwd: xltys1995 + +config: + token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2 + +#License鐩稿叧閰嶇疆 +license: + subject: ycdsasrs + publicAlias: publicCert + storePass: public_zhongyang_123456789 + licensePath: license.lic + publicKeysStorePath: publicCerts.keystore + +#鎺ュ彛缂撳瓨 +system: + enableCache: false + +rcs: + #RCS鍩虹API HOST + baseHost: http://192.168.2.200:9046 + #ESS鎺ユ敹浠诲姟涓嬪彂鎺ュ彛 + essReceiveTask: /task/create + #RCS涓婃姤浠诲姟鐘舵�� + issueTaskOfEvent: /task/create + #RCS閫氱煡浼犺緭绾挎祦鍔� + conveyorStart: /conveyor/moveContainer + -- Gitblit v1.9.1