diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index d202ba1..42c86a0 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index ebb3a1f..f1d252e 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java index 43ac664..bd5e4a4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -105,7 +105,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { SysLabelTemplate updateBefore = sysLabelTemplateRDao.getById(sysLabelTemplate.getId()); if (updateBefore == null) { throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.WMS.getCode()) + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) .setErrorDetail("打印模板不存在") .build(); diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 3580943..fda1e21 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -72,7 +72,7 @@ impp.read.datasource.password=impp_i3_core_pwd ################ \u65E5\u5FD7\u6570\u636E\u6E90 ################ spring.data.mongodb.database=mongoDBSource -spring.data.mongodb.uri=192.168.1.55:27017 +spring.data.mongodb.uri=mongodb://192.168.1.55:27017 spring.data.mongodb.username=sa spring.data.mongodb.password=i3plus spring.data.mongodb.port=27017 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties deleted file mode 100644 index eb1706c..0000000 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker-yfas-nd.properties +++ /dev/null @@ -1,198 +0,0 @@ -#\u672C\u673Aip -impp.server.ip=imppcore -#\u9879\u76EE\u7AEF\u53E3 -server.port=8100 -#\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740 -impp.console.ip=http://console:8010 -#\u670D\u52A1\u6CE8\u518C\u4E2D\u5FC3(\u591A\u6CE8\u518C\u4E2D\u5FC3\u9017\u53F7\u5206\u9694) -impp.cluster.regist.center=http://register:8000/eureka/ -#\u65E5\u5FD7\u9ED8\u8BA4\u4F7F\u7528log4j2 -logging.config=classpath:log4j2-spring.xml - -########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## -#\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58 -impp.config.redis=true -#\u662F\u5426\u5F00\u542FrabbitMQ -impp.config.rabbitmq=true -#\u662F\u5426\u5F00\u542Fswagger -impp.config.swagger=true -#\u662F\u5426\u5F00\u542Fwebsocket -impp.config.websocket=true -#\u662F\u5426\u5F00\u542F\u6587\u4EF6\u670D\u52A1 -# \u9ED8\u8BA4false ,\u53EF\u9009\u9879\uFF1Afastdfs\uFF0Cgofastdfs -impp.config.fileserver=fastdfs -#\u662F\u5426\u5BF9\u53D1\u5E03\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790 -impp.log.detail.controller=true -#\u662F\u5426\u5BF9\u8C03\u7528\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790 -impp.log.detail.service=true -#\u662F\u5426\u5F00\u542F\u5FAE\u670D -eureka.client.enabled=true -#\u6253\u5F00feign\u7684\u7194\u65AD -feign.hystrix.enabled=true - -################ \u961F\u5217\u5904\u7406 ################ -#\u7AD9\u5185\u4FE1 -impp.mq.queue.letter=true -#\u90AE\u4EF6 -impp.mq.queue.mail=true -#\u5B9A\u65F6\u4EFB\u52A1 -impp.mq.queue.schedule=true -#SWEB\u901A\u77E5\u5904\u7406\u961F\u5217 -impp.mq.queue.sweb.notice=true - -################################ \u6570\u636E\u5E93\u76F8\u5173\u8BBE\u7F6E ################################ -# mysql -spring.datasource.validationQuery=SELECT 1 - -################ \u6570\u636E\u6C60\u8BBE\u7F6E ################ -spring.datasource.maximum-pool-size=10 -spring.datasource.max-active=5 -spring.datasource.max-idle=5 -spring.datasource.min-idle=1 -spring.datasource.initial-size=1 -spring.datasource.max-wait=10000 -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=false -spring.datasource.test-while-idle=true -spring.datasource.time-between-eviction-runs-millis=300000 - -##\u4E3B\u6570\u636E\u6E90\uFF0C\u8BFB\u5199 -#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource -impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=wmslogin -impp.write.datasource.password=Wmslogin$%^&7654 - -#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource -#\u4E3B\u4ECE\u590D\u5236\u65F6\u81EA\u52A8\u4FEE\u6539\u8868\u7ED3\u6784\u4F1A\u6709\u95EE\u9898\uFF0C\u6682\u65F6\u6539\u6210\u540C\u4E00\u4E2A\u6570\u636E\u6E90 -impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=wmslogin -impp.read.datasource.password=Wmslogin$%^&7654 - -##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## -impp.schedule.open=true -impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=wmslogin -impp.schedule.datasource.password=Wmslogin$%^&7654 -impp.schedule.datasource.max-connections=50 - -################ \u65E5\u5FD7\u6570\u636E\u6E90 ################ -spring.data.mongodb.database=mongoDBSource -spring.data.mongodb.uri=mongodb:27017 -spring.data.mongodb.username=sa -spring.data.mongodb.password=i3plus -spring.data.mongodb.port=27017 - -################ JPA\u8BBE\u7F6E\u8BBE\u7F6E ################ -# mysql -spring.jpa.database=MYSQL -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -#\u662F\u5426\u663E\u793Asql -spring.jpa.show-sql=true -#\u8868\u5173\u7CFBcreate,create-drop,update,validate -spring.jpa.properties.hibernate.hbm2ddl.auto=update - -#\u5B9A\u65F6\u4EFB\u52A1\u5728\u670D\u52A1\u542F\u52A8\u540E\u591A\u5C11\u79D2\u6267\u884C -impp.schedule.start.after-second=20 -#\u662F\u5426\u96C6\u7FA4\u90E8\u7F72 -impp.schedule.datasource.is-clustered=true -#\u6267\u884C\u68C0\u6D4B\uFF08\u6BEB\u79D2\uFF09\uFF0C\u82E5\u5B95\u673A\u7531\u5176\u4ED6\u5B9A\u65F6\u5668\u6267\u884C -impp.schedule.datasource.cluster-checkin-interval=30000 -#\u7EBF\u7A0B\u6570 -impp.schedule.thread-count=50 -#\u7EBF\u7A0B\u4F18\u5148\u7EA7\uFF081-10\uFF09\u9ED8\u8BA4\u4E3A5 -impp.schedule.thread-priority=5 - - -################################ \u5176\u4ED6\u529F\u80FD\u8BBE\u7F6E ################################ -#redisIP -redis.hostName=redis -#\u7AEF\u53E3\u53F7 -redis.port=6379 -#\u5982\u679C\u6709\u5BC6\u7801 -redis.password= -##\u5176\u4ED6redis\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904 -################## rabbitMQ\u914D\u7F6E #################### -spring.rabbitmq.vhost=/ -spring.rabbitmq.host=rabbitmq -spring.rabbitmq.port=5672 -spring.rabbitmq.username=estsh -spring.rabbitmq.password=estsh123 -##\u5176\u4ED6rabbitMq\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904 - - -################ \u5FAE\u670D\u914D\u7F6E ################ -#\u662F\u5426\u8FDB\u884C\u5065\u5EB7\u68C0\u67E5 -eureka.client.healthcheck.enabled=true -#\u82E5\u65E0\u6CD5\u8FDE\u63A5\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u662F\u5426\u9700\u8981\u4E00\u76F4\u68C0\u6D4B\u52A0\u5165 -impp.cluster.fetch=true -#\u96C6\u7FA4\u540D -eureka.instance.metadata-map.cluster=impp_cluster -#\uFF08\u53C2\u6570\u914D\u7F6E\uFF09\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 -\u300B i3plus-ics\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694 -eureka.client.service-url.defaultZone=${impp.cluster.regist.center} -#\u672C\u670D\u52A1\u4E3B\u673Aip\uFF08\u82E5\u591A\u4E2A\u7F51\u5361\uFF0C\u5219\u9700\u8981\u8BBE\u7F6E\u672C\u670D\u52A1ip\uFF09 -eureka.instance.ip-address=${impp.server.ip} -#\u672C\u670D\u52A1\u5B9E\u4F8BID -eureka.instance.instance-id=${impp.server.ip}:${server.port} -#\u672C\u670D\u52A1\u4E3B\u673A\u540D -eureka.instance.hostname=${impp.server.ip} -#\u672C\u670D\u52A1\u72B6\u6001\u9875\u9762 -eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html -#\u5C06\u81EA\u5DF1\u7684IP\u6CE8\u518C\u5230Eureka Server\u3002\u82E5\u4E0D\u914D\u7F6E\u6216\u8BBE\u7F6E\u4E3Afalse\uFF0C\u8868\u793A\u6CE8\u518C\u5FAE\u670D\u52A1\u6240\u5728\u64CD\u4F5C\u7CFB\u7EDF\u7684hostname\u5230Eureka Server -eureka.instance.prefer-ip-address=true - -################ \u68C0\u6D4B\u673A\u5236 ################ -#\u5FC3\u8DF3\u95F4\u9694\u5468\u671F\uFF0C\u5B95\u673A\u9650\u5236\uFF08\u79D2\uFF09\uFF0C30\u79D2\u6CA1\u53CD\u5E94\u89C6\u4E3A\u5B95\u673A -eureka.instance.lease-expiration-duration-in-seconds=30 -#\u5FC3\u8DF3\u5468\u671F -eureka.instance.lease-renewal-interval-in-seconds=20 -#client\u8FDE\u63A5Eureka\u670D\u52A1\u7AEF\u540E\u7684\u7A7A\u95F2\u7B49\u5F85\u65F6\u95F4\uFF0C\u9ED8\u8BA4\u4E3A30 \u79D2 -eureka.client.eureka-connection-idle-timeout-seconds=1 -#\u6700\u521D\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\u6240\u9700\u7684\u65F6\u95F4\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A40\u79D2 -eureka.client.initial-instance-info-replication-interval-seconds=1 -#\u95F4\u9694\u591A\u957F\u65F6\u95F4\u518D\u6B21\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2 -eureka.client.instance-info-replication-interval-seconds=1 -#\u4ECEeureka\u670D\u52A1\u5668\u6CE8\u518C\u8868\u4E2D\u83B7\u53D6\u6CE8\u518C\u4FE1\u606F\u7684\u65F6\u95F4\u95F4\u9694\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2 -eureka.client.registry-fetch-interval-seconds=1 - -################ \u7194\u65AD\u914D\u7F6E ################ -#\u91CD\u8BD5 -ribbon.maxAutoRetries=2 -#\u8BFB\u53D6\u6570\u636E\u65F6\u957F -ribbon.ReadTimeout=30000 -#\u8FDE\u63A5\u65F6\u957F -ribbon.ConnectTimeout=50000 -#\u54CD\u5E94\u8D85\u8FC7\u65F6\u957F\uFF0C\u8FDB\u884C\u7194\u65AD\uFF08\u7194\u65AD\u8D85\u65F6\u9700\u8981\u5927\u4E8E\u8BFB\u53D6\u65F6\u957F\u53CA\u8FDE\u63A5\u65F6\u957F\uFF09 -hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 - -################ \u94FE\u8DEF\u8FFD\u8E2A ################ -#\u4F7F\u7528web\u65B9\u5F0F\u4F20\u8F93\u4FE1\u606F -spring.zipkin.sender.type=web -#\u94FE\u8DEF\u8FFD\u8E2A\u670D\u52A1\u7684\u5730\u5740 -spring.zipkin.base-url=${impp.console.ip} -#\u8FFD\u8E2A\u6DF1\u5EA6\uFF0C\u767E\u5206\u6BD4\uFF0C1\u662F\u5168\u90E8 -spring.sleuth.sampler.probability=1.0 - -################ FastDfs \u914D\u7F6E ################ -#tracker\u670D\u52A1\u5668ip -fastdfs.tracker_servers=tracker:22122 -# tracker\u7684http\u7AEF\u53E3 -fastdfs.http_tracker_http_port=22122 -# \u4F7F\u7528\u81EA\u5B9A\u4E49\u5DE5\u5177\u83B7\u53D6\u6587\u4EF6\u5C55\u793A\u5730\u5740 -fastdfs.http.ui.host=http://tracker:22122 -#\u5BC6\u7801 -#fastdfs.http.secret_key= - -#\u8FDE\u63A5\u8D85\u65F6 -fastdfs.connect_timeout_in_seconds=10000 -#\u4F20\u8F93\u8D85\u65F6 -fastdfs.network_timeout_in_seconds=10000 -fastdfs.charset=UTF-8 -# token \u9632\u76D7\u94FE\u529F\u80FD -fastdfs.http_anti_steal_token=no - -################ \u6388\u6743\u914D\u7F6E ################ -slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 -slm.app.id=10000 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties deleted file mode 100644 index 609ef1e..0000000 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ /dev/null @@ -1,202 +0,0 @@ -#\u672C\u673Aip -impp.server.ip=192.168.1.241 -#\u9879\u76EE\u7AEF\u53E3 -server.port=18100 -#\u94FE\u8DEF\u8FFD\u8E2Azipkin\u63A7\u5236\u53F0ip\u5730\u5740 -impp.console.ip=http://192.168.1.241:18010 -#\u670D\u52A1\u6CE8\u518C\u4E2D\u5FC3(\u591A\u6CE8\u518C\u4E2D\u5FC3\u9017\u53F7\u5206\u9694) -impp.cluster.regist.center=http://192.168.1.241:18000/eureka/ -#\u65E5\u5FD7\u9ED8\u8BA4\u4F7F\u7528log4j2 -logging.config=classpath:log4j2-spring-prod.xml - -########\u5E73\u53F0\u76F8\u5173\u53C2\u6570########## -#\u662F\u5426\u5F00\u542Fredis\u7F13\u5B58 -impp.config.redis=true -#\u662F\u5426\u5F00\u542FrabbitMQ -impp.config.rabbitmq=true -#\u662F\u5426\u5F00\u542Fswagger -impp.config.swagger=true -#\u662F\u5426\u5F00\u542Fwebsocket -impp.config.websocket=true -#\u662F\u5426\u5F00\u542F\u6587\u4EF6\u670D\u52A1 -# \u9ED8\u8BA4false ,\u53EF\u9009\u9879\uFF1Afastdfs\uFF0Cgofastdfs -impp.config.fileserver=fastdfs -#\u662F\u5426\u5BF9\u53D1\u5E03\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790 -impp.log.detail.controller=true -#\u662F\u5426\u5BF9\u8C03\u7528\u670D\u52A1\u8FDB\u884C\u8BE6\u7EC6\u65E5\u5FD7\u5206\u6790 -impp.log.detail.service=true -#\u662F\u5426\u5F00\u542F\u5FAE\u670D -eureka.client.enabled=true -#\u6253\u5F00feign\u7684\u7194\u65AD -feign.hystrix.enabled=true - -################ \u961F\u5217\u5904\u7406 ################ -#\u7AD9\u5185\u4FE1 -impp.mq.queue.letter=true -#\u90AE\u4EF6 -impp.mq.queue.mail=true -#\u5B9A\u65F6\u4EFB\u52A1 -impp.mq.queue.schedule=true -#SWEB\u901A\u77E5\u5904\u7406\u961F\u5217 -impp.mq.queue.sweb.notice=true - -################################ \u6570\u636E\u5E93\u76F8\u5173\u8BBE\u7F6E ################################ -# mysql -spring.datasource.validationQuery=SELECT 1 - -################ \u6570\u636E\u6C60\u8BBE\u7F6E ################ -spring.datasource.maximum-pool-size=200 -spring.datasource.max-active=100 -spring.datasource.max-idle=100 -spring.datasource.min-idle=30 -spring.datasource.initial-size=20 -spring.datasource.max-wait=10000 -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=false -spring.datasource.test-while-idle=true -spring.datasource.time-between-eviction-runs-millis=300000 - -##\u4E3B\u6570\u636E\u6E90\uFF0C\u8BFB\u5199 -#impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource -impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=impp_i3_core_user -impp.write.datasource.password=impp_i3_core_pwd - -##\u8F85\u6570\u636E\u6E90\uFF0C\u53EA\u8BFB -#impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource -impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=impp_i3_core_user -impp.read.datasource.password=impp_i3_core_pwd - -################ \u65E5\u5FD7\u6570\u636E\u6E90 ################ -spring.data.mongodb.database=mongoDBSource -spring.data.mongodb.uri=192.168.1.240:27017 -spring.data.mongodb.username=sa -spring.data.mongodb.password=i3plus -spring.data.mongodb.port=27017 - -################ JPA\u8BBE\u7F6E\u8BBE\u7F6E ################ -# mysql -spring.jpa.database=MYSQL -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -#\u662F\u5426\u663E\u793Asql -spring.jpa.show-sql=true -#\u8868\u5173\u7CFBcreate,create-drop,update,validate -spring.jpa.properties.hibernate.hbm2ddl.auto=update - - - -##############\u5B9A\u65F6\u4EFB\u52A1\u6301\u4E45\u5316############## -impp.schedule.open=true -impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.240:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=impp_i3_schedule_user -impp.schedule.datasource.password=impp_i3_schedule_pwd -impp.schedule.datasource.max-connections=20 -#\u5B9A\u65F6\u4EFB\u52A1\u5728\u670D\u52A1\u542F\u52A8\u540E\u591A\u5C11\u79D2\u6267\u884C -impp.schedule.start.after-second=20 -#\u662F\u5426\u96C6\u7FA4\u90E8\u7F72 -impp.schedule.datasource.is-clustered=true -#\u6267\u884C\u68C0\u6D4B\uFF08\u6BEB\u79D2\uFF09\uFF0C\u82E5\u5B95\u673A\u7531\u5176\u4ED6\u5B9A\u65F6\u5668\u6267\u884C -impp.schedule.datasource.cluster-checkin-interval=30000 -#\u7EBF\u7A0B\u6570 -impp.schedule.thread-count=10 -#\u7EBF\u7A0B\u4F18\u5148\u7EA7\uFF081-10\uFF09\u9ED8\u8BA4\u4E3A5 -impp.schedule.thread-priority=5 - - - -################################ \u5176\u4ED6\u529F\u80FD\u8BBE\u7F6E ################################ -#redisIP -redis.hostName=192.168.1.240 -#\u7AEF\u53E3\u53F7 -redis.port=6379 -#\u5982\u679C\u6709\u5BC6\u7801 -redis.password= -##\u5176\u4ED6redis\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904 -################## rabbitMQ\u914D\u7F6E #################### -spring.rabbitmq.vhost=/ -spring.rabbitmq.host=192.168.1.240 -spring.rabbitmq.port=5672 -spring.rabbitmq.username=estsh -spring.rabbitmq.password=estsh123 -##\u5176\u4ED6rabbitMq\u914D\u7F6E\u9700\u8981\u8C03\u6574\u7684\u52A0\u5728\u6B64\u5904 - - -################ \u5FAE\u670D\u914D\u7F6E ################ -#\u662F\u5426\u8FDB\u884C\u5065\u5EB7\u68C0\u67E5 -eureka.client.healthcheck.enabled=true -#\u82E5\u65E0\u6CD5\u8FDE\u63A5\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u662F\u5426\u9700\u8981\u4E00\u76F4\u68C0\u6D4B\u52A0\u5165 -impp.cluster.fetch=true -#\u96C6\u7FA4\u540D -eureka.instance.metadata-map.cluster=impp_cluster -#\uFF08\u53C2\u6570\u914D\u7F6E\uFF09\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 -\u300B i3plus-ics\uFF0C\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694 -eureka.client.service-url.defaultZone=${impp.cluster.regist.center} -#\u672C\u670D\u52A1\u4E3B\u673Aip\uFF08\u82E5\u591A\u4E2A\u7F51\u5361\uFF0C\u5219\u9700\u8981\u8BBE\u7F6E\u672C\u670D\u52A1ip\uFF09 -eureka.instance.ip-address=${impp.server.ip} -#\u672C\u670D\u52A1\u5B9E\u4F8BID -eureka.instance.instance-id=${impp.server.ip}:${server.port} -#\u672C\u670D\u52A1\u4E3B\u673A\u540D -eureka.instance.hostname=${impp.server.ip} -#\u672C\u670D\u52A1\u72B6\u6001\u9875\u9762 -eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html -#\u5C06\u81EA\u5DF1\u7684IP\u6CE8\u518C\u5230Eureka Server\u3002\u82E5\u4E0D\u914D\u7F6E\u6216\u8BBE\u7F6E\u4E3Afalse\uFF0C\u8868\u793A\u6CE8\u518C\u5FAE\u670D\u52A1\u6240\u5728\u64CD\u4F5C\u7CFB\u7EDF\u7684hostname\u5230Eureka Server -eureka.instance.prefer-ip-address=true - -################ \u68C0\u6D4B\u673A\u5236 ################ -#\u5FC3\u8DF3\u95F4\u9694\u5468\u671F\uFF0C\u5B95\u673A\u9650\u5236\uFF08\u79D2\uFF09\uFF0C30\u79D2\u6CA1\u53CD\u5E94\u89C6\u4E3A\u5B95\u673A -eureka.instance.lease-expiration-duration-in-seconds=30 -#\u5FC3\u8DF3\u5468\u671F -eureka.instance.lease-renewal-interval-in-seconds=20 -#client\u8FDE\u63A5Eureka\u670D\u52A1\u7AEF\u540E\u7684\u7A7A\u95F2\u7B49\u5F85\u65F6\u95F4\uFF0C\u9ED8\u8BA4\u4E3A30 \u79D2 -eureka.client.eureka-connection-idle-timeout-seconds=1 -#\u6700\u521D\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\u6240\u9700\u7684\u65F6\u95F4\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A40\u79D2 -eureka.client.initial-instance-info-replication-interval-seconds=1 -#\u95F4\u9694\u591A\u957F\u65F6\u95F4\u518D\u6B21\u590D\u5236\u5B9E\u4F8B\u4FE1\u606F\u5230eureka\u670D\u52A1\u5668\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2 -eureka.client.instance-info-replication-interval-seconds=1 -#\u4ECEeureka\u670D\u52A1\u5668\u6CE8\u518C\u8868\u4E2D\u83B7\u53D6\u6CE8\u518C\u4FE1\u606F\u7684\u65F6\u95F4\u95F4\u9694\uFF08s\uFF09\uFF0C\u9ED8\u8BA4\u4E3A30\u79D2 -eureka.client.registry-fetch-interval-seconds=1 - - -################ \u7194\u65AD\u914D\u7F6E ################ -#\u91CD\u8BD5 -ribbon.maxAutoRetries=2 -#\u8BFB\u53D6\u6570\u636E\u65F6\u957F -ribbon.ReadTimeout=30000 -#\u8FDE\u63A5\u65F6\u957F -ribbon.ConnectTimeout=50000 -#\u54CD\u5E94\u8D85\u8FC7\u65F6\u957F\uFF0C\u8FDB\u884C\u7194\u65AD\uFF08\u7194\u65AD\u8D85\u65F6\u9700\u8981\u5927\u4E8E\u8BFB\u53D6\u65F6\u957F\u53CA\u8FDE\u63A5\u65F6\u957F\uFF09 -hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 - -################ \u94FE\u8DEF\u8FFD\u8E2A ################ -#\u4F7F\u7528web\u65B9\u5F0F\u4F20\u8F93\u4FE1\u606F -spring.zipkin.sender.type=web -#\u94FE\u8DEF\u8FFD\u8E2A\u670D\u52A1\u7684\u5730\u5740 -spring.zipkin.base-url=${impp.console.ip} -#\u8FFD\u8E2A\u6DF1\u5EA6\uFF0C\u767E\u5206\u6BD4\uFF0C1\u662F\u5168\u90E8 -spring.sleuth.sampler.probability=1.0 - - -################ FastDfs \u914D\u7F6E ################ -#tracker\u670D\u52A1\u5668ip -fastdfs.tracker_servers=tracker:22122 -# tracker\u7684http\u7AEF\u53E3 -fastdfs.http_tracker_http_port=22122 -# \u4F7F\u7528\u81EA\u5B9A\u4E49\u5DE5\u5177\u83B7\u53D6\u6587\u4EF6\u5C55\u793A\u5730\u5740 -fastdfs.http.ui.host=http://tracker:22122 -#\u5BC6\u7801 -#fastdfs.http.secret_key= - -#\u8FDE\u63A5\u8D85\u65F6 -fastdfs.connect_timeout_in_seconds=5 -#\u4F20\u8F93\u8D85\u65F6 -fastdfs.network_timeout_in_seconds=60 -fastdfs.charset=UTF-8 -# token \u9632\u76D7\u94FE\u529F\u80FD -fastdfs.http_anti_steal_token=no - -################ \u6388\u6743\u914D\u7F6E ################ -slm.api.password=4C9479EBEFA6FA6E232EF25EFA49C4D2 -slm.app.id=10000 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index db038ab..078ac2c 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -1,5 +1,5 @@ #\u4F7F\u7528\u914D\u7F6E -spring.profiles.active=21 +spring.profiles.active=docker #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C\u7801 desc.application.name=\u6838\u5FC3\u7BA1\u7406\u540E\u53F0 diff --git a/pom.xml b/pom.xml index b8e6d69..0425111 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice @@ -21,7 +21,7 @@ - + i3core UTF-8 UTF-8 @@ -51,7 +51,7 @@ ${project.version} - + i3plus.core i3plus-core-icloud @@ -166,7 +166,7 @@ ${project.version} - + i3plus.icloud i3plus-icloud-core @@ -301,7 +301,7 @@ - + nexus @@ -309,7 +309,7 @@ - + maven-releases @@ -325,7 +325,7 @@ - + org.apache.maven.plugins maven-jar-plugin