diff --git a/pom.xml b/pom.xml index fe8fca4..4b75f51 100644 --- a/pom.xml +++ b/pom.xml @@ -119,11 +119,11 @@ module-dictionary 1.0-SNAPSHOT - - ink.wgink - mongo-module-dictionary - 1.0-SNAPSHOT - + + + + + cn.com.tenlion module-project-config @@ -172,14 +172,14 @@ 4.39.2.ALL - - org.springframework.session - spring-session-data-redis - - - org.springframework.kafka - spring-kafka - + + + + + + + + org.springframework.boot spring-boot-starter-websocket diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2b99414..e873076 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,7 +1,7 @@ server: port: 8091 - url: http://192.168.0.15:8091/operator/ - ip: 192.168.0.15 + url: http://127.0.0.1:8091/operator/ + ip: 127.0.0.1 system-title: 运营平台 system-sub-title: 运营平台 default-index-page: route/systemuser/index @@ -31,14 +31,14 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://192.168.0.151/db_system_operator?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true + url: jdbc:mysql://192.168.0.151:3306/db_system_operator?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true db-type: mysql driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root - initial-size: 2 - min-idle: 2 - max-active: 10 + initial-size: 10 + min-idle: 10 + max-active: 20 # 配置获取连接等待超时的时间 max-wait: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 @@ -87,7 +87,7 @@ spring: uri: mongodb://smartcity:smartcity@10.25.248.193:6011/smartcity redis: database: 6 - host: 192.168.0.156 + host: 127.0.0.16 port: 6379 password: 666 timeout: 3000ms @@ -99,7 +99,7 @@ spring: min-idle: 0 kafka-local: topics: tableSync - bootstrap-servers: 192.168.0.156:9093 + bootstrap-servers: 127.0.0.16:9093 #bootstrap-servers: 175.24.42.217:9096 #bootstrap-servers: 49.233.36.36:58093 producer: @@ -139,7 +139,7 @@ swagger: # 文件上传管理 file: # 文件的保存路径 - upload-path: C:\Users\TS-QD1\Desktop\UploadFiles\ + upload-path: C:\Users\cmxx0\Desktop\UploadFiles\ # 图片类型 image-types: png,jpg,jpeg,gif,blob # 视频类型 @@ -167,27 +167,26 @@ file: video: 100 audio: 600 -#api-path: -# user-center: http://192.168.0.155:7011/usercenter -# user-center-2: http://${server.ip}/usercenter -# -#security: -# oauth2: -# oauth-server: ${api-path.user-center} -# oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} -# client: -# client-id: f7f93ed52a844d4aaf40eb5af22b401b -# client-secret: U2Vkenl2MGg3cThhTlI3bGN6VXdyOExubFowTWhsVWJsbVBTTXovNmhZemxIdG9KZmEyTjJIRnI0dG1McEdEVA== -# user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize -# access-token-uri: ${security.oauth2.oauth-server}/oauth2_client/token -# grant-type: authorization_code -# resource: -# jwt: -# key-uri: ${security.oauth2.oauth-server}/oauth2_client/token_key -# token-info-uri: ${security.oauth2.oauth-server}/oauth2_client/check_token -# user-info-uri: ${security.oauth2.oauth-server}/user -# authorization: -# check-token-access: ${security.oauth2.oauth-server}/oauth2_client/token_key +security: + oauth2: + oauth-server: http://127.0.0.1:8091/operator/ + oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} + client: + client-id: 46c4715a2a504dd48398bda88b5c3a88 + client-secret: Rlc0WlBvWGRRZVlJbGdPb3BnMzZxVmU1ZFlOdVFLcHo1QnFCQ1UvVFAzSGxIdG9KZmEyTjJIRnI0dG1McEdEVA== + user-authorization-uri: ${security.oauth2.oauth-server}/oauth2_client/authorize + access-token-uri: ${security.oauth2.oauth-server}/oauth2_client/token + grant-type: authorization_code + resource: + jwt: + key-uri: ${security.oauth2.oauth-server}/oauth2_client/token_key + token-info-uri: ${security.oauth2.oauth-server}/oauth2_client/check_token + user-info-uri: ${security.oauth2.oauth-server}/user + authorization: + check-token-access: ${security.oauth2.oauth-server}/oauth2_client/token_key +api-path: + user-center: http://127.0.0.1:8091/operator/ + # # # 短信验证码服务 @@ -201,19 +200,45 @@ sms: template: verification-code: '{sign} 您的验证码为 {content}, 有效时间为120秒,若非本人操作,请忽略。' -wxpay: - # 商户号 - mchId: 1609461201 - # 商户API证书序列号 - mchSerialNo: 3492AF71B2FC29014997E16FF6499E27F7A0781B - # 商户私钥文件 - # 注意:apiclient_key地址 - privateKeyPath: D:\WxCertUtils\WXCertUtil\cert\1609461201_20240203_cert\apiclient_key.pem - # APIv3密钥 - apiV3Key: _TSKJ_0471_TSkj_0471_tsKJ_0471__ - # APPID 小程序id - appid: wxe17874894f7ff27b - # 微信服务器地址 - domain: https://api.mch.weixin.qq.com - # 接收结果通知地址 - notifyUrl: xxx \ No newline at end of file +pay: + wx-pay: + # 商户号 + mch-id: 1609461201 + # 商户API证书序列号 + mch-no: 3492AF71B2FC29014997E16FF6499E27F7A0781B + # 私钥本地存储路径 + private-key-path: D:\AH\apiclient_key.pem + # API v3密钥 + api-v3-key: _TSKJ_0471_TSkj_0471_tsKJ_0471__ + # 小程序APPID + app-id: wxe17874894f7ff27b + # 二维码超时时间/单位:分钟 + time-out: 5 + # 微信服务器网关地址 + url: https://api.mch.weixin.qq.com + # 接收结果通知地址.如果需要动态替换订单号,则以 {orderNo} 占位 + notify-url: https://lg48844529.vicp.fun/operator/api/account/pay-wx/{orderNo} + # 单笔最大金额 + max-money: 2000 + # 单笔最小金额 + min-money: 0.1 + ali-pay: + # 应用ID + # 西藏 app-id: 2021004137636507 + app-id: 2021004138650351 + # 支付宝服务器网关地址 + url: https://openapi.alipay.com/gateway.do + # 应用私钥 + # 西藏 private-key: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCMR1SNMLAfqFnzswWftBv1TnKGgILoDNkthHienFLcEUU1eb0ws7ST8QQZGQEZaHCKSGo82Nvvhwx6+7LGwC5liiu/RGh7CZYEul8+8GwGvsTh7wf1+dEH7YtyfJV1kyUF+p9lL0qRKBbcgUSM8QMyLeCBFE+AVvIqSce8ZLTwetpHSqZFP1VnFuH+gl8c23vDLOySoXCrhqL62Wy3MRmwFtRbOJ6UXicpmU5qxeauERGOlFhQ+5AraPhuRqkvtjN0PnTRbAT1OBEClvW1XXsS+y7i8davSuJWdO4Nmm1PcfUoza1GsspuNKRscgx7znv4SEfjq48HzGf1AJ/ZdhObAgMBAAECggEADSPlZLBp3x1LB8v+O96IO+tUSQsiuA/0DBJ7pgforxqjDAZSVYyP3sfV5W/1LWceG6X65aY+u+o/ngmTzpBUCEjwHiOPUe8s8VZv85pb1CnskWltqnnzPbXfuSK4cWIONsgqRDUw2/YQZilpvXYaIYownIbFh7UdTB7LKfeZB2mm4z76h5wWT90rZtBEXvRuCJrD48xuoksgA5Lul54Jl4MVUBRMB+QyAdnRUddiEaeN47BNOrpsWFSoHQGujTZ9t229VylmRO5+p2Tq1uLrYNR8ZhKbUzhQaVrtUd2lu8TdEMcfCNWWpPTNUry9JdLVKETXoc66+C9fvyTvUo9xEQKBgQDV6UA2CadOOIjhFgya7+Bnn24aaP5wbPAFjjcFgGfQDME9yRRFTovnT5KXQZSvjHxsr+ifETPCj7RMeI0eaE4O/yist4frcvY2BoGgJDE6RmZiG9VGCI68m6y+YvXFXnnZc3lDdXXrkmMKB0uR5vrUR0yrfgEWYsIe8s3BCLSREwKBgQCn4THa1jGoBesRdsGcrQ04CtvIQY83glyjZmxaLjYeFGXxLfOjSJBojK3NfCWrA/0qLS9gN5R3dw0ES7hPPCAA2TBwHfJijfF5U5bODF3S+F9fNP4QuJkNA9PK4oX7KIf7cm8muREwpwyDsAATzr/uc/mSXKS504Wjb4Jfu6pMWQKBgED9L6P7RNhP9s4jy8qazFvPJT1i3sK7ZiTZ8z95ppCf/2nNGJqB5aFuHIRVyV2YWgkPXKZPLKGU1VtSWNV/LRADV5E55VKUR9dcHK/Rrx8cWmi+Ogqf+PW2ekIRgMfpDy4Qliv3mM7sV6ipVL1MJrKtws5rZtstP/r1G6vlAC7/AoGAd2GAnmnq7d0niEe27r9wwwWVvRZBzet6DQhszMRH36QJyjQvKVIUvwQrJBDAiJhRk4iGRBnCDiIus3tVGaNb7r6D33asQsFFkk2K1AOfRMMyrvV0JlffHo42MfRb6nqsGHcL67F3M+3WzF5/75X6josSUq5mxW5RfiNxxrohJCECgYBCeNxjadcyOhwL+BYjr8iIzqX+njguNhunrc0/xfD1WBJjK9QM9hD2TbYrdODUselc1QSM5ZlDLYjdYmEq+COr0gZhok7nHnzLV/SCIkEdT9wLLIestGFZDimcXGTmsKxXqQcGFwrwRnFEu3Xue7/36mG314giD0tIiJtK0CBpyw== + private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCWIpiransdWYJr9EXA83USVuWjX+hLhCAVHtIJqTPXPFShOW+Rv5aoXHGUsmMfs325DB0lNM/2aYS7Fyym4fzMkLYUHtJoICHafspgJraYpx19jkaSnEkiVgR/UxgDLFFKVubPIszV+zpm8J2xt8PkZHyhuaQEOtBcAGKcNRacDd9DfGZj75vPvhtvVvEFWndeuMZ6d67i2opUVL2c395vPkrjX74Q6GzZ/osfTrCD/3+JHdQXBm0bpOdx7ARJxIyR2sn+7AkPAcXdc3Kz7NoP8C84q09daqwUk6y711ZZfqUmUfAuP4vnh5vMrwcrqlRfc9/LbbH/0U3VFxjtAL2HAgMBAAECggEAMDMLMH0O6W1DIcVaX4fJngmnz7uKqDPS2PT8GX3o1sDXqqr11qTbiVGkZUif6h2Fz1LESJ2b5lAZ/LaD70++CS6sRelfQ26Nb8gk0JmdJYUBQr3ailcCY7OZ3gafPuWLc4JSt01E1a3CIio9dkC48yoPmRwwO+tl2SOGhP/GMnMDtQQ48fzJ/slqofOxyXvGPsZVi+XJz6Ht9mZPEx+jNcdgfOizCGWC6u4IlbOaC/7SP3XVqBk3NlAHk49RoRgJTuZOApU8lS32WMvM/NCRcS/qt5lGjwIFn+TjCOCpmwcqU98yEVGhyJI/xpTJk6/HEEpeCOhJFj+Z0UFjab8SAQKBgQDLGqcS7rW0Q6qNCm9BUvpotXybfoLKF6yjJPprcGe2PtelM5fFgGOurdgafOdnPvLr1lXYe2Ld0d7UioZ2uxTAUrQ3QjeR7I9fACAQHuQ6cJud89ZvGozzWrYhbK1ObZE3tg41+nDfG8qeFnPSY1L5yxreFVH0x+yOBaPhiRhskQKBgQC9PGYwutnIc+UbyS8WU2cRpcXAeAXC2pxQZ14l3gfAXETkUgehh9lKI8R5i0iHxBCvwLMXFSGGJORGQUDj/SVBjWpbuunRJKeaXyYmUnvkthdLSdg1O/KwuJHHfdd1MA4RarKe8Pz4ZqbkGguCKS0sPt39xym7ShZkG26ul3d0lwKBgQC/McHhwrFultxwlUgSWIi+FUrOHhQFJrAvjFno1hHrr9DVBXJ0S96Ky8BJfxdfTBTmCgkaF10Er9Jyhkz6bDamrbRU6JLjXavBpJ6KTmpO0T7NPIO6Z2YUmGonoOSsldxEc6+BBNdIUCM3Gq/BeBreZ2JNegiCw8leENUrNSG24QKBgQCtMu3ZJfuUcza74rw9M+K/DTncuj2TpWCyWpmaEQiJMCpByy5+0oa3S9tU331n/bTEF5wSwV1omLVx8+F/ij+iKtuwz3eX23OnX/Tb2Fza7SqO1yyTNKYgxx1uOCiOcog9uql3vdvbQqD3XzsvS56zw2qNDs+MQvgRceYw2CMWSwKBgGLOf7gdMKmr2D/H86MRI2nGoJ56/2iUu/haRmLmG0rQgc8yV+y9ax2cVm9+2ammCK0MU8bnxZJ4/vatdvCYyKXt+caKOb3JP4aDldayIdJe2wcCr0uh6HK9w317l85QCmc2S6YTYkWJWowf6h4E7UdZtIjGGdIAWfaV1Frzdo0l + # 支付宝公钥 + # 西藏 ali-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhPuhyfS+awhnbd50xA50GC/hbjeuR4SKVPV6mkEWMGJHFYdicVL0+TKkgl3p9I4c/4OKuQjr0w1dGtyTVDAKDCYdRGpi9av0jP1bYqU0Asg8YnHcLNYYO5zc8olV2DpKd1odHx+Lq7KbO40tN2dYsU1CUBYAMBPsqc4bccomdXHSqE48fOAOu0lYVAk3+7Rlm0yZ4Ya87CVr93pfVlyYRwl0TCeOJ0HeNS/5lWoVpAqsbIUnAi1CkoKC0xLWNriibNjjb9x5KjpxrxTylI9L/FA393XpkevVLtAFVPh9mqKCac+VSw8Fo6c8IVqhJRMV1WjLAzEa8pVkIXD29gav5wIDAQAB + ali-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Hi1l310TLDfLnmJlpyyaj1V5JgrKyQgbtx3+QPoE/vauRKl/4pKbyIEgvvYWxB9XG5ZAewyCCh+AsXi0Et9/JBvINopBq5ki/gRn0lOmjNjsGXorz25dNPui0uX8b/0el2giH8Cs0VFHQEByISyf0ZsyK00V7yZ/kBIjvWinyPzKu3drSJQr4ukwWf1h31gXPcpn4hF7kuSAG5TRtDMeriG05WMMnWhUj/Ma3a4D8lf4NaeTa7Qvy+Ha2tTFnvwHBP6VSKllLdOa9/GzpzVRSG0UZT3vuTDup5rv8XIGI3184T6oKqFqp7uHvr9UazO06swyYcLA3gjh8CfKjr+6wIDAQAB + # 支付&二维码超时时间/单位:分钟 + time-out: 5 + # 接收结果通知地址.如果需要动态替换订单号,则以 {orderNo} 占位 + notify-url: https://lg48844529.vicp.fun/operator/api/account/pay-zfb/{orderNo} + # 单笔最大金额 + max-money: 2000 + # 单笔最小金额 + min-money: 0.1 \ No newline at end of file