Browse Source

运营服务

hym 4 years ago
parent
commit
d170f7a265

+ 40 - 27
smartcity-facilities/src/main/resources/application-sit.properties

@@ -1,11 +1,12 @@
-server.port=8326
-spring.application.name=smart-city-v2-device
+server.port=8337
+
+spring.application.name=smart-city-v2-facilities
 #log
 logging.level.root=info
-logging.path=/opt/sit/smartcity-device/logs
+logging.path=./logs/smartcity-facilities-service
 
-#数据库配置
-spring.datasource.url=jdbc:mysql://10.0.0.161:3306/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#\u6570\u636E\u5E93\u914D\u7F6E
+spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_v2?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=root
 spring.datasource.password=100Zone@123
 spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
@@ -23,19 +24,20 @@ spring.datasource.druid.max-active=20
 spring.datasource.druid.max-wait=60000
 spring.datasource.druid.initial-size=1
 
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.zcxk.*.entity
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.zcxk.facilities.entity,com.zcxk.common.entity
 mybatis.configuration.map-underscore-to-camel-case=true
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis.configuration.use-column-label=true
+mybatis.type-handlers-package=com.zcxk.facilities.handle
 
 spring.jackson.time-zone=GMT+8
 #spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 #spring.jackson.joda-date-time-format: yyyy-MM-dd HH:mm:ss
 
 # redis
-spring.redis.host=10.0.0.161
-spring.redis.port=6379
+spring.redis.host=114.135.61.188
+spring.redis.port=26379
 spring.redis.password=zoniot
 spring.redis.database=13
 
@@ -44,19 +46,18 @@ spring.data.mongodb.uri=mongodb://114.135.61.188:17017/smartcity
 #spring.data.mongodb.uri=mongodb://127.0.0.1:27017/test
 logging.level.org.springframework.data.mongodb.core=DEBUG
 
-
 security.oauth2.resource.id=smartcity-deivice-service
-security.oauth2.resource.user-info-uri=http://10.0.0.154:8320/user/user/principal
+security.oauth2.resource.user-info-uri=http://localhost:8320/user/user/principal
 security.oauth2.resource.prefer-token-info=false
 
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
-spring.servlet.multipart.location=/opt/sit/smartcity-device/data
+spring.servlet.multipart.location=./logs/smartcity-facilities-service
 
 #kafka server
-spring.kafka.bootstrap-servers=10.0.0.161:6377
+spring.kafka.bootstrap-servers=114.135.61.188:36377
 #kafka consumer config
-spring.kafka.consumer.group-id=device-group-sit
+spring.kafka.consumer.group-id=facilities-group-dev
 spring.kafka.consumer.auto-offset-reset=latest
 spring.kafka.consumer.enable-auto-commit=true
 #kafka producer config
@@ -66,23 +67,24 @@ spring.kafka.producer.buffer-memory=40960
 spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer
 spring.kafka.consumer.value-deserializer=org.springframework.kafka.support.serializer.JsonDeserializer
 spring.kafka.consumer.properties.spring.json.trusted.packages=*
-com.zcxk.kafka.operation-log.topic=operation_log_sit
+com.zcxk.kafka.operation-log.topic=operation_log_dev
 #spring cloud stream kafka
-spring.cloud.stream.bindings.customer-message.destination=customer_channel_sit
-spring.cloud.stream.bindings.project-message.destination=project_channel_sit
-spring.cloud.stream.bindings.product-category-message.destination=product_category_channel_sit
-spring.cloud.stream.bindings.channel-message.destination=channel_message_channel_sit
-spring.cloud.stream.bindings.building-message.destination=building_message_channel_sit
-spring.cloud.stream.bindings.community-message.destination=community_message_channel_sit
-spring.cloud.stream.bindings.site-message.destination=site_message_channel_sit
-spring.cloud.stream.bindings.alarm-type-message.destination=alarm_type_channel_sit
-spring.cloud.stream.bindings.notify-message.destination=notify_channel_sit
+spring.cloud.stream.bindings.customer-message.destination=customer_channel_dev
+spring.cloud.stream.bindings.project-message.destination=project_channel_dev
+spring.cloud.stream.bindings.product-category-message.destination=product_category_channel_dev
+spring.cloud.stream.bindings.channel-message.destination=channel_message_channel_dev
+spring.cloud.stream.bindings.building-message.destination=building_message_channel_dev
+spring.cloud.stream.bindings.community-message.destination=community_message_channel_dev
+spring.cloud.stream.bindings.site-message.destination=site_message_channel_dev
+spring.cloud.stream.bindings.alarm-type-message.destination=alarm_type_channel_dev
+spring.cloud.stream.bindings.notify-message.destination=notify_channel_dev
+
 
 #nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.154:8321
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8321
 
 #Dubbo
-dubbo.scan.base-packages=com.zcxk.device
+dubbo.scan.base-packages=com.zcxk.facilities
 dubbo.protocol.name=dubbo
 dubbo.protocol.port=-1
 dubbo.registry.address=spring-cloud://localhost
@@ -92,4 +94,15 @@ logging.level.com.alibaba.nacos.client.naming=error
 
 dubbo.application.qos-enable=true
 dubbo.application.qos-port=33334
-dubbo.application.qos-accept-foreign-ip=false
+dubbo.application.qos-accept-foreign-ip=false
+
+feign.httpclient.connection-timeout=10000
+#http
+http_pool.max_total=200
+http_pool.default_max_per_route=100
+http_pool.connect_timeout=5000
+http_pool.connection_request_timeout=1000
+http_pool.socket_timeout=65000
+http_pool.validate_after_inactivity=2000
+sync.time=0 0 0/1 * * ?
+

+ 1 - 0
smartcity-gateway/src/main/java/com/zcxk/gateway/config/SwaggerProvider.java

@@ -48,6 +48,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider {
         resources.add(swaggerResource("日志服务接口", "/log/v2/api-docs?group=api"));
         resources.add(swaggerResource("数据接入服务接口", "/access/v2/api-docs?group=api"));
         resources.add(swaggerResource("web服务接口", "/web/v2/api-docs?group=api"));
+        resources.add(swaggerResource("运营服务", "/facilities/v2/api-docs?group=api"));
         return resources;
     }
 

+ 11 - 1
smartcity-gateway/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=8320
+server.port=8321
 
 logging.level.root=info
 logging.path=D:/logs/smart-city-v2-gateway
@@ -43,5 +43,15 @@ spring.cloud.gateway.routes[5].uri=lb://smart-city-v2-log
 spring.cloud.gateway.routes[5].predicates[0]=Path=/log/**
 spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[6].id=facilities
+spring.cloud.gateway.routes[6].uri=lb://smart-city-v2-facilities
+spring.cloud.gateway.routes[6].predicates[0]=Path=/facilities/**
+spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[7].id=message
+spring.cloud.gateway.routes[7].uri=lb://smart-city-v2-facilities
+spring.cloud.gateway.routes[7].predicates[0]=Path=/message/smart-city-v2-message
+spring.cloud.gateway.routes[7].filters[0]=StripPrefix=1
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB

+ 12 - 5
smartcity-gateway/src/main/resources/application-sit.properties

@@ -1,15 +1,13 @@
 server.port=8320
 
 logging.level.root=info
-logging.path=/opt/sit/smartcity-gateway/logs
+logging.path=./logs/smart-city-v2-gateway
 logging.level.com.alibaba.nacos.client.naming=error
 #指定服务名
 spring.application.name=smart-city-v2-gateway
 
-
 #nacos
-spring.cloud.nacos.discovery.server-addr=10.0.0.153:8329
-
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8321
 
 spring.cloud.gateway.discovery.locator.enabled=true
 spring.cloud.gateway.discovery.locator.lowerCaseServiceId=true
@@ -45,6 +43,15 @@ spring.cloud.gateway.routes[5].uri=lb://smart-city-v2-log
 spring.cloud.gateway.routes[5].predicates[0]=Path=/log/**
 spring.cloud.gateway.routes[5].filters[0]=StripPrefix=1
 
+spring.cloud.gateway.routes[6].id=facilities
+spring.cloud.gateway.routes[6].uri=lb://smart-city-v2-facilities
+spring.cloud.gateway.routes[6].predicates[0]=Path=/facilities/**
+spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[7].id=message
+spring.cloud.gateway.routes[7].uri=lb://smart-city-v2-message
+spring.cloud.gateway.routes[7].predicates[0]=Path=/message/**
+spring.cloud.gateway.routes[7].filters[0]=StripPrefix=1
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
-