From 3f9efbe0247842230b02d53215a781af85f2a29b Mon Sep 17 00:00:00 2001 From: Penny <2500338766@qq.com> Date: Sat, 5 Aug 2023 19:28:19 +0800 Subject: [PATCH] =?UTF-8?q?feature-1.0:=E6=9C=8D=E5=8A=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cyjd/rights/ClientApiApplication.java | 4 +- .../src/main/resources/application-dev.yml | 47 ++++++++++++++++ .../src/main/resources/application-prod.yml | 47 ++++++++++++++++ .../src/main/resources/application-test.yml | 16 +++--- .../src/main/resources/application.yml | 55 +++---------------- 5 files changed, 113 insertions(+), 56 deletions(-) create mode 100644 rights-client-controller/src/main/resources/application-dev.yml create mode 100644 rights-client-controller/src/main/resources/application-prod.yml diff --git a/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java b/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java index ace1c07..aea9cb0 100644 --- a/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java +++ b/rights-client-controller/src/main/java/com/cyjd/rights/ClientApiApplication.java @@ -1,5 +1,6 @@ package com.cyjd.rights; +import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -15,11 +16,12 @@ import java.util.TimeZone; @EnableAsync @ServletComponentScan @MapperScan(basePackages = {"com.cyjd.rights.business.mapper"}) +@Slf4j public class ClientApiApplication { public static void main(String[] args) { TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); SpringApplication.run(ClientApiApplication.class, args); - System.out.println("=========加载完毕========"); + log.debug("=========服务加载完毕========"); } } diff --git a/rights-client-controller/src/main/resources/application-dev.yml b/rights-client-controller/src/main/resources/application-dev.yml new file mode 100644 index 0000000..cb5ff2d --- /dev/null +++ b/rights-client-controller/src/main/resources/application-dev.yml @@ -0,0 +1,47 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://117.50.61.7:3306/rights?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false&rewriteBatchedStatements=true + username: root + password: Ck200582 + hikari: + maximum-pool-size: 2 + redis: + host: 117.50.61.7 + port: 6379 + password: Ck200582 + database: 2 + timeout: 5000s # 数据库连接超时时间，2.0 中该参数的类型为Duration，这里在配置的时候需要指明单位 + # 连接池配置，2.0中直接使用jedis或者lettuce配置连接池 + block-when-exhausted: true + test-while-idle: true + test-on-borrow: true + jedis: + pool: + # 最大空闲连接数 + max-idle: 500 + # 最小空闲连接数 + min-idle: 50 + # 等待可用连接的最大时间，负数为不限制 + max-wait: -1 + # 最大活跃连接数，负数为不限制 + max-active: -1 + cache: + redis: + #毫秒 + time-to-live: -1 +payment: + ali: + appId: 2021003135690045 + privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCGq3UKNbNuIazHbD9slLNJsStw2347rYwR1NmFLCi/d62yNLeTZvmrY4aW3GsDsQiK5vFdLRxaT8tIkGO11GilBRn00xkNKnwPkMA8GUdtr7GaudH+YBqk2snDeBhtdlYLq1V79USGZKdnpsPoUIXVIpyhnBlULzcJP7hf7NSauRVBnDf+MuEQOjhRAc6i8RN7nY2Oz5x6ZuIPhJ8qWjbZQoN6sJ00KU5oYZaN34/NGmPIfpR4QwbZbABm0Y0dCwkXzzNoV3cPYsFqKWNN8gxY7mI7YQqYsVb25fvALDjOl0XUGv1D7lMOC4mX3iz4q8b13ZNK+Tb3y4atwO6jK0EdAgMBAAECggEAUb4ZGM1n0F2YZqQKC3pnKT/lQme4w7if4OL19aPMSAv43sao90v2GFYdB81bF66JpOZxc0FCiH8OwUkDfQclTaU/ECBigF9dVoViahheBvIyN9y63lCvW4mCFqf7C9ZcfFDPXqKNqZXHF19eYtEdqzWLJX1+0l6mZXLME03J7u+tPX+OOnjf/K3wBp90RzoS02Ofp8fxiRyiDwFwlcxfRVbffLPVIW8JMqyOuI95U0l90F3N48+twJj8UeZlWHQeTGSDZ5jgfC6T5SXkDxOi6e7ZemZUG43rqsEHyb84fBfpr4ZFh9SkjXSnRih5w0VRws50dE2u1wAeCLG8K5KD8QKBgQDX/rpHjIJl0aD2LsI1kcUW82Yzm7qOJWApRCTe/+mZtrNGotzz/Mc2S0xV8s95ahgsH9AYqytu58UdM0CQhJ5+57fPDQcYWq9QvHB741ljAd1371qTLvRsMQg6E/nmObFvAON7ynNuh+TfkM9e7HQS6dpA0FkVqrREdD7hgUeUewKBgQCfnL3GKdMdH5FTTMBJgiLwHYBpgFQxDPzD5DEvz9lgCgosk76k4jQGi/3/raJWxkAED5K4O2J90IE/VnRXV4Uhi4h54D3ceO9dtXWBN1IxqEuO7pw9ldiRjFrlTo4aSgnq2wrjiVKn92Fm2YXIcAyhibUs7hamWt6LGAULbM5JRwKBgG11jXlM35gxz9xyfcEgCj1DQ/vLY5M9panD+tt33S4kxF17k3WiGGKPbjPwROxGs9FInfCibfRaSC4wFvwl+Rxe2Wt4MqxI6KeFl4tw/4+JFm79QW1tUjix8HVeQjpF6oFSdfX59t2AyJ/zhuOX+IrNL+nArCSqyYgXUPZ+yYOZAoGATbLAkxnDInc+iF1hcac/GMJTw4fr9CDNXxLTeuHkgKMChua5NIzFJLa7Q96jmzhQ62klVDfcX0DD2jBc3DPHpCfHnQSzOINKisSN2gQzJ+c0OPUg673pOhkoGl5eQJ/wKfrNVyx/JzL+oFGdlZAuJejiYGfacMrlcLKVqhUiansCgYEAtPCz8J3fYipscjdWKQIXsejr110KF0zsh8X7ZYKxhAgRZ5ck3wbMbffYIfa7wCm5nIJMY640P3Jh6Rb5W5/4/i04gHbE1Loi714aGCXoY6gm5oVoKIFP8h3g3MyQl7mZ2huAA/KnLsThlmfQ0l0n6Pd8xEcqJ+Ggi/GS2MQQrIw= + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhqt1CjWzbiGsx2w/bJSzSbErcNt+O62MEdTZhSwov3etsjS3k2b5q2OGltxrA7EIiubxXS0cWk/LSJBjtdRopQUZ9NMZDSp8D5DAPBlHba+xmrnR/mAapNrJw3gYbXZWC6tVe/VEhmSnZ6bD6FCF1SKcoZwZVC83CT+4X+zUmrkVQZw3/jLhEDo4UQHOovETe52Njs+cembiD4SfKlo22UKDerCdNClOaGGWjd+PzRpjyH6UeEMG2WwAZtGNHQsJF88zaFd3D2LBailjTfIMWO5iO2EKmLFW9uX7wCw4zpdF1Br9Q+5TDguJl94s+KvG9d2TSvk298uGrcDuoytBHQIDAQAB + certPath: /home/cert/alibaba/ + signNotifyUrl: https://interface.bnyer.cn/alipay/signNotify + agreementNotifyUrl: https://interface.bnyer.cn/alipay/agreementNotify + signReturnUrl: https://vediocnd.corpring.com/hotVIP/paybackImg.png +yunmei: + url: https://yh.yunemei.com + +logging: + level: + com.cyjd.rights.business.mapper: debug diff --git a/rights-client-controller/src/main/resources/application-prod.yml b/rights-client-controller/src/main/resources/application-prod.yml new file mode 100644 index 0000000..49d5f70 --- /dev/null +++ b/rights-client-controller/src/main/resources/application-prod.yml @@ -0,0 +1,47 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://203.104.38.186:6002/rights?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false&rewriteBatchedStatements=true + username: bnyer_cloud + password: CIYUANjiedian2021. + hikari: + maximum-pool-size: 2 + redis: + host: 203.104.38.232 + port: 6003 + password: CIYUANjiedian2021. + database: 2 + timeout: 5000s # 数据库连接超时时间，2.0 中该参数的类型为Duration，这里在配置的时候需要指明单位 + # 连接池配置，2.0中直接使用jedis或者lettuce配置连接池 + block-when-exhausted: true + test-while-idle: true + test-on-borrow: true + jedis: + pool: + # 最大空闲连接数 + max-idle: 500 + # 最小空闲连接数 + min-idle: 50 + # 等待可用连接的最大时间，负数为不限制 + max-wait: -1 + # 最大活跃连接数，负数为不限制 + max-active: -1 + cache: + redis: + #毫秒 + time-to-live: -1 +payment: + ali: + appId: 2021003135690045 + privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCGq3UKNbNuIazHbD9slLNJsStw2347rYwR1NmFLCi/d62yNLeTZvmrY4aW3GsDsQiK5vFdLRxaT8tIkGO11GilBRn00xkNKnwPkMA8GUdtr7GaudH+YBqk2snDeBhtdlYLq1V79USGZKdnpsPoUIXVIpyhnBlULzcJP7hf7NSauRVBnDf+MuEQOjhRAc6i8RN7nY2Oz5x6ZuIPhJ8qWjbZQoN6sJ00KU5oYZaN34/NGmPIfpR4QwbZbABm0Y0dCwkXzzNoV3cPYsFqKWNN8gxY7mI7YQqYsVb25fvALDjOl0XUGv1D7lMOC4mX3iz4q8b13ZNK+Tb3y4atwO6jK0EdAgMBAAECggEAUb4ZGM1n0F2YZqQKC3pnKT/lQme4w7if4OL19aPMSAv43sao90v2GFYdB81bF66JpOZxc0FCiH8OwUkDfQclTaU/ECBigF9dVoViahheBvIyN9y63lCvW4mCFqf7C9ZcfFDPXqKNqZXHF19eYtEdqzWLJX1+0l6mZXLME03J7u+tPX+OOnjf/K3wBp90RzoS02Ofp8fxiRyiDwFwlcxfRVbffLPVIW8JMqyOuI95U0l90F3N48+twJj8UeZlWHQeTGSDZ5jgfC6T5SXkDxOi6e7ZemZUG43rqsEHyb84fBfpr4ZFh9SkjXSnRih5w0VRws50dE2u1wAeCLG8K5KD8QKBgQDX/rpHjIJl0aD2LsI1kcUW82Yzm7qOJWApRCTe/+mZtrNGotzz/Mc2S0xV8s95ahgsH9AYqytu58UdM0CQhJ5+57fPDQcYWq9QvHB741ljAd1371qTLvRsMQg6E/nmObFvAON7ynNuh+TfkM9e7HQS6dpA0FkVqrREdD7hgUeUewKBgQCfnL3GKdMdH5FTTMBJgiLwHYBpgFQxDPzD5DEvz9lgCgosk76k4jQGi/3/raJWxkAED5K4O2J90IE/VnRXV4Uhi4h54D3ceO9dtXWBN1IxqEuO7pw9ldiRjFrlTo4aSgnq2wrjiVKn92Fm2YXIcAyhibUs7hamWt6LGAULbM5JRwKBgG11jXlM35gxz9xyfcEgCj1DQ/vLY5M9panD+tt33S4kxF17k3WiGGKPbjPwROxGs9FInfCibfRaSC4wFvwl+Rxe2Wt4MqxI6KeFl4tw/4+JFm79QW1tUjix8HVeQjpF6oFSdfX59t2AyJ/zhuOX+IrNL+nArCSqyYgXUPZ+yYOZAoGATbLAkxnDInc+iF1hcac/GMJTw4fr9CDNXxLTeuHkgKMChua5NIzFJLa7Q96jmzhQ62klVDfcX0DD2jBc3DPHpCfHnQSzOINKisSN2gQzJ+c0OPUg673pOhkoGl5eQJ/wKfrNVyx/JzL+oFGdlZAuJejiYGfacMrlcLKVqhUiansCgYEAtPCz8J3fYipscjdWKQIXsejr110KF0zsh8X7ZYKxhAgRZ5ck3wbMbffYIfa7wCm5nIJMY640P3Jh6Rb5W5/4/i04gHbE1Loi714aGCXoY6gm5oVoKIFP8h3g3MyQl7mZ2huAA/KnLsThlmfQ0l0n6Pd8xEcqJ+Ggi/GS2MQQrIw= + publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhqt1CjWzbiGsx2w/bJSzSbErcNt+O62MEdTZhSwov3etsjS3k2b5q2OGltxrA7EIiubxXS0cWk/LSJBjtdRopQUZ9NMZDSp8D5DAPBlHba+xmrnR/mAapNrJw3gYbXZWC6tVe/VEhmSnZ6bD6FCF1SKcoZwZVC83CT+4X+zUmrkVQZw3/jLhEDo4UQHOovETe52Njs+cembiD4SfKlo22UKDerCdNClOaGGWjd+PzRpjyH6UeEMG2WwAZtGNHQsJF88zaFd3D2LBailjTfIMWO5iO2EKmLFW9uX7wCw4zpdF1Br9Q+5TDguJl94s+KvG9d2TSvk298uGrcDuoytBHQIDAQAB + certPath: /home/cert/alibaba/ + signNotifyUrl: https://interface.bnyer.cn/alipay/signNotify + agreementNotifyUrl: https://interface.bnyer.cn/alipay/agreementNotify + signReturnUrl: https://vediocnd.corpring.com/hotVIP/paybackImg.png +yunmei: + url: https://yh.yunemei.com + +logging: + level: + com.cyjd.rights.business.mapper: debug diff --git a/rights-client-controller/src/main/resources/application-test.yml b/rights-client-controller/src/main/resources/application-test.yml index e318b29..412124d 100644 --- a/rights-client-controller/src/main/resources/application-test.yml +++ b/rights-client-controller/src/main/resources/application-test.yml @@ -1,18 +1,16 @@ -server: - port: 8086 spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://203.104.38.186:6002/rights?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false&rewriteBatchedStatements=true - username: bnyer_cloud - password: CIYUANjiedian2021. + url: jdbc:mysql://117.50.61.7:3306/rights?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false&rewriteBatchedStatements=true + username: root + password: Ck200582 hikari: maximum-pool-size: 2 redis: - host: 203.104.38.232 - port: 6003 - password: CIYUANjiedian2021. - database: 0 + host: 117.50.61.7 + port: 6379 + password: Ck200582 + database: 2 timeout: 5000s # 数据库连接超时时间，2.0 中该参数的类型为Duration，这里在配置的时候需要指明单位 # 连接池配置，2.0中直接使用jedis或者lettuce配置连接池 block-when-exhausted: true diff --git a/rights-client-controller/src/main/resources/application.yml b/rights-client-controller/src/main/resources/application.yml index d647bf5..24deafd 100644 --- a/rights-client-controller/src/main/resources/application.yml +++ b/rights-client-controller/src/main/resources/application.yml @@ -1,49 +1,12 @@ +# Tomcat server: port: 8086 -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://203.104.38.186:6002/rights?allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false&rewriteBatchedStatements=true - username: bnyer_cloud - password: CIYUANjiedian2021. - hikari: - maximum-pool-size: 2 - redis: - host: 203.104.38.232 - port: 6003 - password: CIYUANjiedian2021. - database: 2 - timeout: 5000s # 数据库连接超时时间，2.0 中该参数的类型为Duration，这里在配置的时候需要指明单位 - # 连接池配置，2.0中直接使用jedis或者lettuce配置连接池 - block-when-exhausted: true - test-while-idle: true - test-on-borrow: true - jedis: - pool: - # 最大空闲连接数 - max-idle: 500 - # 最小空闲连接数 - min-idle: 50 - # 等待可用连接的最大时间，负数为不限制 - max-wait: -1 - # 最大活跃连接数，负数为不限制 - max-active: -1 - cache: - redis: - #毫秒 - time-to-live: -1 -payment: - ali: - appId: 2021003135690045 - privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCGq3UKNbNuIazHbD9slLNJsStw2347rYwR1NmFLCi/d62yNLeTZvmrY4aW3GsDsQiK5vFdLRxaT8tIkGO11GilBRn00xkNKnwPkMA8GUdtr7GaudH+YBqk2snDeBhtdlYLq1V79USGZKdnpsPoUIXVIpyhnBlULzcJP7hf7NSauRVBnDf+MuEQOjhRAc6i8RN7nY2Oz5x6ZuIPhJ8qWjbZQoN6sJ00KU5oYZaN34/NGmPIfpR4QwbZbABm0Y0dCwkXzzNoV3cPYsFqKWNN8gxY7mI7YQqYsVb25fvALDjOl0XUGv1D7lMOC4mX3iz4q8b13ZNK+Tb3y4atwO6jK0EdAgMBAAECggEAUb4ZGM1n0F2YZqQKC3pnKT/lQme4w7if4OL19aPMSAv43sao90v2GFYdB81bF66JpOZxc0FCiH8OwUkDfQclTaU/ECBigF9dVoViahheBvIyN9y63lCvW4mCFqf7C9ZcfFDPXqKNqZXHF19eYtEdqzWLJX1+0l6mZXLME03J7u+tPX+OOnjf/K3wBp90RzoS02Ofp8fxiRyiDwFwlcxfRVbffLPVIW8JMqyOuI95U0l90F3N48+twJj8UeZlWHQeTGSDZ5jgfC6T5SXkDxOi6e7ZemZUG43rqsEHyb84fBfpr4ZFh9SkjXSnRih5w0VRws50dE2u1wAeCLG8K5KD8QKBgQDX/rpHjIJl0aD2LsI1kcUW82Yzm7qOJWApRCTe/+mZtrNGotzz/Mc2S0xV8s95ahgsH9AYqytu58UdM0CQhJ5+57fPDQcYWq9QvHB741ljAd1371qTLvRsMQg6E/nmObFvAON7ynNuh+TfkM9e7HQS6dpA0FkVqrREdD7hgUeUewKBgQCfnL3GKdMdH5FTTMBJgiLwHYBpgFQxDPzD5DEvz9lgCgosk76k4jQGi/3/raJWxkAED5K4O2J90IE/VnRXV4Uhi4h54D3ceO9dtXWBN1IxqEuO7pw9ldiRjFrlTo4aSgnq2wrjiVKn92Fm2YXIcAyhibUs7hamWt6LGAULbM5JRwKBgG11jXlM35gxz9xyfcEgCj1DQ/vLY5M9panD+tt33S4kxF17k3WiGGKPbjPwROxGs9FInfCibfRaSC4wFvwl+Rxe2Wt4MqxI6KeFl4tw/4+JFm79QW1tUjix8HVeQjpF6oFSdfX59t2AyJ/zhuOX+IrNL+nArCSqyYgXUPZ+yYOZAoGATbLAkxnDInc+iF1hcac/GMJTw4fr9CDNXxLTeuHkgKMChua5NIzFJLa7Q96jmzhQ62klVDfcX0DD2jBc3DPHpCfHnQSzOINKisSN2gQzJ+c0OPUg673pOhkoGl5eQJ/wKfrNVyx/JzL+oFGdlZAuJejiYGfacMrlcLKVqhUiansCgYEAtPCz8J3fYipscjdWKQIXsejr110KF0zsh8X7ZYKxhAgRZ5ck3wbMbffYIfa7wCm5nIJMY640P3Jh6Rb5W5/4/i04gHbE1Loi714aGCXoY6gm5oVoKIFP8h3g3MyQl7mZ2huAA/KnLsThlmfQ0l0n6Pd8xEcqJ+Ggi/GS2MQQrIw= - publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhqt1CjWzbiGsx2w/bJSzSbErcNt+O62MEdTZhSwov3etsjS3k2b5q2OGltxrA7EIiubxXS0cWk/LSJBjtdRopQUZ9NMZDSp8D5DAPBlHba+xmrnR/mAapNrJw3gYbXZWC6tVe/VEhmSnZ6bD6FCF1SKcoZwZVC83CT+4X+zUmrkVQZw3/jLhEDo4UQHOovETe52Njs+cembiD4SfKlo22UKDerCdNClOaGGWjd+PzRpjyH6UeEMG2WwAZtGNHQsJF88zaFd3D2LBailjTfIMWO5iO2EKmLFW9uX7wCw4zpdF1Br9Q+5TDguJl94s+KvG9d2TSvk298uGrcDuoytBHQIDAQAB - certPath: /home/cert/alibaba/ - signNotifyUrl: https://interface.bnyer.cn/alipay/signNotify - agreementNotifyUrl: https://interface.bnyer.cn/alipay/agreementNotify - signReturnUrl: https://vediocnd.corpring.com/hotVIP/paybackImg.png -yunmei: - url: https://yh.yunemei.com -logging: - level: - com.cyjd.rights.business.mapper: debug +# Spring +spring: + application: + # 应用名称 + name: right-client + profiles: + # 环境配置 + active: prod \ No newline at end of file