diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml index 743a28f4..ccf49223 100644 --- a/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml +++ b/hzs-business-lenjoy/hzs-business-lenjoy-member/src/main/resources/bootstrap.yml @@ -3,13 +3,13 @@ hzs: # 当前环境(测试=test,生产=online) env: test # PC地址 - pc: https://cn.hzs413.com/ + pc: # 公众号地址 - gzh: 海之圣 + gzh: # IOS地址 - ios: APP Store 搜索海之圣 + ios: # android地址 - android: http://yxydl.hzs413.com/q2efum + android: # Tomcat server: @@ -87,16 +87,6 @@ dubbo: # dubbo 服务扫描包(开启之后才会对外提供服务) base-packages: com.hzs.lenjoy.member -## OSS配置 -oss: - accessKeyId: LTAI5t8KB2WzVot3JxEocav1 - accessKeySecret: pvepVr3BLyPMXwDtQ8RwOJJUUsnMkL - bucketName: hzs-in - endpoint: oss-cn-beijing.aliyuncs.com - ## 研发、测试使用目录前缀 - prefixDirectory: test-new - filePath: https://hzs-in.oss-cn-beijing.aliyuncs.com/ - # 日志配置 logging: level: diff --git a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml index 1960d219..41ac5ba0 100644 --- a/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml +++ b/hzs-business-lenjoy/hzs-business-lenjoy-sale/src/main/resources/bootstrap.yml @@ -3,13 +3,13 @@ hzs: # 当前环境(测试=test,生产=online) env: test # PC地址 - pc: https://cn.hzs413.com/ + pc: # 公众号地址 - gzh: 海之圣 + gzh: # IOS地址 - ios: APP Store 搜索海之圣 + ios: # android地址 - android: http://yxydl.hzs413.com/q2efum + android: # 当前环境(0=启用 1=禁用) enable: 1 diff --git a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml index 8533b72c..69a2460a 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-bonus/src/main/resources/bootstrap.yml @@ -1,15 +1,15 @@ # 项目配置 hzs: - # PC地址 - pc: https://cn.hzs413.com/ - # 公众号地址 - gzh: 海之圣 - # IOS地址 - ios: APP Store 搜索海之圣 - # android地址 - android: http://yxydl.hzs413.com/q2efum # 当前环境(测试=test,生产=online) env: test + # PC地址 + pc: + # 公众号地址 + gzh: + # IOS地址 + ios: + # android地址 + android: # Tomcat @@ -80,16 +80,6 @@ dubbo: # dubbo 服务扫描包(开启之后才会对外提供服务) base-packages: com.hzs.bonus -## OSS配置 -oss: - accessKeyId: LTAI5t8KB2WzVot3JxEocav1 - accessKeySecret: pvepVr3BLyPMXwDtQ8RwOJJUUsnMkL - bucketName: hzs-in - endpoint: oss-cn-beijing.aliyuncs.com - ## 研发、测试使用目录前缀 - prefixDirectory: test-new - filePath: https://hzs-in.oss-cn-beijing.aliyuncs.com/ - # 日志配置 logging: level: diff --git a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml index ec422c29..1956b446 100644 --- a/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-member/src/main/resources/bootstrap.yml @@ -1,15 +1,15 @@ # 项目配置 hzs: # 当前环境(测试=test,生产=online) - env: online + env: test # PC地址 - pc: https://cn.hzs413.com/ + pc: # 公众号地址 - gzh: 海之圣 + gzh: # IOS地址 - ios: APP Store 搜索海之圣 + ios: # android地址 - android: http://yxydl.hzs413.com/q2efum + android: # Tomcat server: @@ -83,16 +83,6 @@ dubbo: # dubbo 服务扫描包(开启之后才会对外提供服务) base-packages: com.hzs.member -## OSS配置 -oss: - accessKeyId: LTAI5t8KB2WzVot3JxEocav1 - accessKeySecret: pvepVr3BLyPMXwDtQ8RwOJJUUsnMkL - bucketName: hzs-in - endpoint: oss-cn-beijing.aliyuncs.com - ## 研发、测试使用目录前缀 - prefixDirectory: test-new - filePath: https://hzs-in.oss-cn-beijing.aliyuncs.com/ - # 日志配置 logging: level: diff --git a/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml index fdd08f0a..2c6440a8 100644 --- a/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-report/src/main/resources/bootstrap.yml @@ -1,3 +1,8 @@ +# 项目配置 +hzs: + # 当前环境(测试=test,生产=online) + env: test + # Tomcat server: port: 8097 diff --git a/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml index e3622775..24707181 100644 --- a/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-sale/src/main/resources/bootstrap.yml @@ -3,13 +3,13 @@ hzs: # 当前环境(测试=test,生产=online) env: test # PC地址 - pc: https://cn.hzs413.com/ + pc: # 公众号地址 - gzh: 海之圣 + gzh: # IOS地址 - ios: APP Store 搜索海之圣 + ios: # android地址 - android: http://yxydl.hzs413.com/q2efum + android: # 当前环境(0=启用 1=禁用) enable: 1 diff --git a/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml b/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml index b1fe0726..879e6669 100644 --- a/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml +++ b/hzs-business/hzs-business-system/src/main/resources/bootstrap.yml @@ -71,21 +71,6 @@ dubbo: # dubbo 服务扫描包(开启之后才会对外提供服务) base-packages: com.hzs.system -## OSS配置 -oss: - accessKeyId: LTAI5t8KB2WzVot3JxEocav1 - accessKeySecret: pvepVr3BLyPMXwDtQ8RwOJJUUsnMkL - bucketName: hzs-in - endpoint: oss-cn-beijing.aliyuncs.com - ## 研发、测试使用目录前缀 - prefixDirectory: test-new - filePath: https://hzs-in.oss-cn-beijing.aliyuncs.com/ - -## IP定位 -ipapi: - ipApiURL: http://ip-api.com/json/ - - # 日志配置 logging: level: diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ip/IpLocationConfig.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ip/IpLocationConfig.java deleted file mode 100644 index b4de07cc..00000000 --- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/utils/ip/IpLocationConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hzs.common.core.utils.ip; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * IP定位配置 - */ -@Data -@Component -@ConfigurationProperties(prefix = "ipapi") -public class IpLocationConfig { - - /** - * 请求URL - */ - private String ipApiURL; - -} diff --git a/hzs-gateway/src/main/resources/bootstrap.yml b/hzs-gateway/src/main/resources/bootstrap.yml index 02fe4fa2..b02ef363 100644 --- a/hzs-gateway/src/main/resources/bootstrap.yml +++ b/hzs-gateway/src/main/resources/bootstrap.yml @@ -91,13 +91,6 @@ spring: - Path=/sale/**, /activity/** filters: - StripPrefix=1 - # # 活动模块 - # - id: hzs-activity - # uri: lb://hzs-activity - # predicates: - # - Path=/activity/** - # filters: - # - StripPrefix=1 # 统计模块 - id: hzs-report uri: lb://hzs-report @@ -105,13 +98,13 @@ spring: - Path=/report/** filters: - StripPrefix=1 - # 小程序模块 - - id: hzs-applet - uri: lb://hzs-applet - predicates: - - Path=/cabin/** - filters: - - StripPrefix=1 +# # 小程序模块 +# - id: hzs-applet +# uri: lb://hzs-applet +# predicates: +# - Path=/cabin/** +# filters: +# - StripPrefix=1 # 奖金模块 - id: hzs-bonus uri: lb://hzs-bonus @@ -126,13 +119,13 @@ spring: - Path=/scm/** filters: - StripPrefix=1 - # 店务模块 - - id: hzs-shop - uri: lb://hzs-shop - predicates: - - Path=/shop/** - filters: - - StripPrefix=1 +# # 店务模块 +# - id: hzs-shop +# uri: lb://hzs-shop +# predicates: +# - Path=/shop/** +# filters: +# - StripPrefix=1 # 安全配置 security: diff --git a/hzs-third/src/main/resources/bootstrap.yml b/hzs-third/src/main/resources/bootstrap.yml index b1d5ff14..96809969 100644 --- a/hzs-third/src/main/resources/bootstrap.yml +++ b/hzs-third/src/main/resources/bootstrap.yml @@ -354,15 +354,15 @@ share: ## 分享专区分享地址 sharePath: http://p1.hzs413.com/#/pages/shareRegist/index -## OSS配置 -oss: - accessKeyId: LTAI5t8KB2WzVot3JxEocav1 - accessKeySecret: pvepVr3BLyPMXwDtQ8RwOJJUUsnMkL - bucketName: hzs-in - endpoint: oss-cn-beijing.aliyuncs.com - ## 研发、测试使用目录前缀 - prefixDirectory: test-new - filePath: https://hzs-in.oss-cn-beijing.aliyuncs.com/ +### OSS配置 +#oss: +# accessKeyId: LTAI5t8ygAH3p3uNmruj5To9 +# accessKeySecret: Ryq6EqZZx38v8VGiMkO9JFNVVKyuJu +# bucketName: bd-qd +# endpoint: oss-cn-beijing.aliyuncs.com +# ## 研发、测试使用目录前缀 +# prefixDirectory: test_01 +# filePath: https://bd-qd.oss-cn-beijing.aliyuncs.com/ ## 身份证OCR接口 idCardOcr: