diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 048f2e2..aaa71ef 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -9,7 +9,8 @@ spring: connection-init-sql: SELECT 1 connection-test-query: SELECT 1 datasource: - master: url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + master: #${SERVER_ADDRESS} + url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application-pre.yml b/src/main/resources/application-pre.yml new file mode 100644 index 0000000..460b451 --- /dev/null +++ b/src/main/resources/application-pre.yml @@ -0,0 +1,137 @@ +spring: + datasource: + dynamic: + primary: master + strict: true #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. + hikari: + minimum-idle: 4 + maximum-pool-size: 4 + connection-init-sql: SELECT 1 + connection-test-query: SELECT 1 + datasource: + master: #${SERVER_ADDRESS} + url: jdbc:mysql://${SERVER_ADDRESS}:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + username: ${MYSQL_NAME} + password: ${MYSQL_PWD} + driver-class-name: com.mysql.cj.jdbc.Driver + slave: + url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + username: ${MYSQL_NAME} + password: ${MYSQL_PWD} + driver-class-name: com.mysql.cj.jdbc.Driver + redis: + port: 6379 #Redis服务器连接的端口 + host: ${SERVER_ADDRESS} # Redis服务器的地址 + password: ${REDIS_PWD} # Redis服务器连接密码（默认为空） + timeout: 5000 # 连接超时时间（毫秒） + lettuce: #参考博客 https://blog.csdn.net/weixin_43944305/article/details/124322595 + pool: + maxActive: 5000 #最大连接数 + maxIdle: 30 #连接池最大空闲连接数. + minIdle: 5 #连接池最小空闲连接数. + max-wait: 2000 #从连接池中获取连接时的最大等待时间 + time-between-eviction-runs: 60s #空闲对象逐出器线程的运行间隔时间.空闲连接线程释放周期时间. + cluster: + refresh: + adaptive: true #拓扑动态感应即客户端能够根据 redis cluster 集群的变化，动态改变客户端的节点情况，完成故障转移。 + period: 60s #刷新redis集群状态周期时间 + +global: + rsaPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC_F5UQC1QWsu3QsESQBz9M-GDA9Atm0qVSvwIsy568lyRLi-nq3VvvnmgrlL4yTbngFzyfb2Dn35cNCHsBvIaGuCY3_PpzPqMzVpxr2QlEkhEX9atnJQ1rWexS8QeZtPjpiIwoQrChTzXjD_sYUkDrqSykFplyivf0NSO2WqCBdwIDAQAB + rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAL8XlRALVBay7dCwRJAHP0z4YMD0C2bSpVK_AizLnryXJEuL6erdW--eaCuUvjJNueAXPJ9vYOfflw0IewG8hoa4Jjf8-nM-ozNWnGvZCUSSERf1q2clDWtZ7FLxB5m0-OmIjChCsKFPNeMP-xhSQOupLKQWmXKK9_Q1I7ZaoIF3AgMBAAECgYBxTUA61Ry0oL7U_86HP2TO9G4ZuhmQi9EucMaPXOPvmgYRLRIzCbDbMKc_P-BN3zwYnG57cgSZNz9OoPqeGvP_oVTnkoEpVkCSV-JP2p_DK09LdbDqszJXMrxAkPmWGUw8IRMcTJT1xJJcgzFE6T0CmTo-Vk47AnmqfJD4U6o74QJBAPRjVUJKZnrMSnSqKPDL2ThgTo8h7-KFxl_Z-g724lTOFiCmBpi6nCWAcuacFRrrYqxF-r9c4zdIyR7AvLROql8CQQDIK_kRF52dVtwShciZhyeUBLoi0nWV9F8mMGt60NTEER9zPEgPsv2aVn8h97KMWOwmd2Da4EPm25QxOuaKQC_pAkBczcfXp5co9KElkmR_pHl1jiTm97U3qSM-zPDHc_tYxvXiKgoBP4QCPbfkWMsu8MoEr4Jb3vMt0EcHlZtTQTgzAkAfmNla-lhV4sUgY1_T5EK6GbjsED6hag6u74u3ukkrnexR-10ApWdkumydBwV3I_464DM4uZfeVCDjWIHVpuYpAkEA6QLPztGD4V8Q1PqTEeSF3i68CKPM8vO1_mCH2JD7qsqDQcIKkczj5rTg7hlOKwB9V6gSw4CbnOF6moTooRD-cQ + +##redis +#redis: +# datasource: +# token: +# database: 1 +# host: 122.112.153.128 +# port: 6379 +# password: 'redis' +# lettuce: +# pool: +# max-active: 8 +# max-wait: -1ms +# max-idle: 8 +# min-idle: 0 +# timeout: 3000ms + +#oss: +# name: alioss +# endpoint: ll-oss-pre.lianlianlvyou.com +# accessKey: +# secretKey: +# bucketName: +# args: +# expireTime: 3600 #过期时间 +# contentLengthRange: 2000 #大小限制 +##oss: +## name: alioss +## endpoint: ll-oss-pre.lianlianlvyou.com +## accessKey: +## secretKey: +## bucketName: +## args: +## expireTime: 3600 #过期时间 +## contentLengthRange: 2000 #大小限制 +## redis分布式锁 +#redisson: +# enabled: true +# address: 'redis://192.168.10.113:6379' +# password: '123456' +# database: 5 +# connectionPoolSize: 4 +# connectionMinimumIdleSize: 4 +# +## 阿里云rocketmq +#aliyun: +# rocketmq: +# config: +# AccessKey: 1 +# SecretKey: 1 +# NAMESRV_ADDR: 1 +# GROUP_ID: 1 +# producer: +# enabled: true +# +#rabbitmq: +# configs: +# order: #实例名称 +# host: 192.168.10.111 +# port: 5672 +# virtualHost: ll-dev +# username: zhangziheng +# password: zhangziheng +# producer: +# enabled: true +# exchange: order_status +# routingKey: ORDER_COMPLETE +# confirmCallback: orderMqConfirmCallback +# commonChange: +# host: 192.168.10.111 +# port: 5672 +# virtualHost: ll-dev +# username: zhangziheng +# password: zhangziheng +# producer: +# enabled: false +# consumer: +# enabled: true +# subscribeList: +# - queue: 'app-business' +# messageListener: commonChangeMessageListener +# +##应用可以默认使用的配置文件 +#global: +# testCofnig: "aaa" +# tokenSecret: '12435twefdsfsdt4tsdcqw43tregdsgd' +# tokenExpire: 14400 #10天 +# smsMqTopic: 'topic_msg' +# smsMqTag: 'tag-sms' +# rsaPrivateKey: 'MIIEpQIBAAKCAQEAuAltXJI4kMQkucWCeLGK4Zyqw7VUp1JYS1GkJb0eJKCgxqJBzwjl8XpStA1hCv9BEX6SEsm/d2T6SDo+G6ySpfV0RQeZ7v32kE9+Eh0BK1Q8wU91nCa1CM9yfBhKXsQ3DKq2am5oLryNWXdKLXZPgoJbuIONG2G4oKakwUMX3aASp3Cj3rNXLea8ilXjFZ+OEp0DuZ4CsasO1MTaBS84mJhnzRNbuhHq5qyrVI02jw7Fim8siIBsmDDHgBd4l9hj6KAAr0jf9JOHaOp+KxfH76taqqaXI5lZIPG7lCP65iBuNNEqDSc21abcPhgvgK5K4xj9p5sG+V1FBISCE0dPrQIDAQABAoIBAG6dg/UTEhq5OhXKyDwBAqfOgbk2IVacoONMg+wG+rorLdeWKRXmlEcLLfB45i409Agu2l+ekY2SzPhiwXfixxYnLSZchkJmtS9SCEWc11oSvJ24Q8mCXmeYQIikFPdW2nurlA7uo4IL5K20jIo8xVd9QOHreAHQP6eX4gkjaZHUIOSJ2P6iffEQCHbXehoyCoTMLdK+1HTuZdO4C9r/S9f/Y1kLWfV5ogEi0DHJpUy37npinfqPp0LHbgpK2WBPOkQIhKvi/4OQ71EcYR5gyrA7nR+rQyPHdhFzTTyfTNTgmuNFuAYJODN5yd62RQd8i6chMx63tYDoYhCjI/ixv8UCgYEA9S1JTacLrFQP+2ryHnn6A3JOhbzj1Y552Nc1XixI9aJMxxCJGI0PvmzDb46BSLfoOz4yaqL1lBS2vyX4tc1rKL82JiokZhDlnFNS0yQgR03484BGPJ3D1+tTWQV0cXyq0nYOI+m9vPBciI1Lw07tJ5ZqJbTabtcu2aq8WrKMuFsCgYEAwCk0WB5TTQJQgjuuFXT/GU4cIl8/Pa3IgF7Ccd1WVkFr9uI6vBpToN+0i1zAb83Ss9maD3eH1Na/7GiKwzZOJj8Yas6b1UsbcHZA1Yt+cI2WUZf8L8QVYJrUtIkbKbG+jdg/KjjZt8mAO8IcXivUhfmj8XUIBClYCezEZmSIVpcCgYEAupHWmUfHo0Bo1QqB6l0pupuuUyj1OxprcG38B4itkHYL9OOJX+xgEalUYzzO9tYz23kuBmWxeRj2I6kyhK4noF85RnuFLUIoZ/gkK9Xu1jPogOuZByGK2XETAMgc3wteNj9t7Tg+kVtbHvJet+YEo75bUgw4uGX5GdxJ7r62RMcCgYEAgJfSaJm6oxFGcTCg+cj2oaeM2k+lEZCHWaiQNQSqr0ROjMOuDI0No92wg4aJXQh+1U5sc6dI5dzkSL9ZBPQFbkDRBUDINf9yGFt6Xa1g6s9FZcrwv8JXj/NtHneWDtvcqi2pb4bl48DbqKHou/hW22VJGd94gthsCxBACkmCl3cCgYEAp2/KJrDnLwAr4h6SVCufRRuNkZSRI+XITkE4xyQ/UDeL+iwCbX38Jcqa2lxCAXCLk++1xilSF/sJbBVkiDorBU9CC0tI5tPJFfHQodbePx1C0SQE8e0F+wtaeR9Z5m5KzHNs2Gciqw+2nJPU9uFQjUfGdXuIZF2bBvtXBWH+Prk=' +# rsaPublickey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuAltXJI4kMQkucWCeLGK4Zyqw7VUp1JYS1GkJb0eJKCgxqJBzwjl8XpStA1hCv9BEX6SEsm/d2T6SDo+G6ySpfV0RQeZ7v32kE9+Eh0BK1Q8wU91nCa1CM9yfBhKXsQ3DKq2am5oLryNWXdKLXZPgoJbuIONG2G4oKakwUMX3aASp3Cj3rNXLea8ilXjFZ+OEp0DuZ4CsasO1MTaBS84mJhnzRNbuhHq5qyrVI02jw7Fim8siIBsmDDHgBd4l9hj6KAAr0jf9JOHaOp+KxfH76taqqaXI5lZIPG7lCP65iBuNNEqDSc21abcPhgvgK5K4xj9p5sG+V1FBISCE0dPrQIDAQAB' +# appDowloadUrl: 'http://llzby.cn/s/E9TTlQrJ' +# pcAccessUrl: 'http://llzby.cn/s/E9TTlQrJ' +# customServiceUrl: 'https://chaten.soboten.com/chat/h5/v2/index.html?sysnum=caf21f78c499463fbb54077f5c4a8efd&channelid=13&source=1&groupid=d16ef9bdcf3b46dc9726bbb00a7ee45b&partnerid=' #智齿客服 + biz_userId +# + diff --git a/src/main/resources/docker/boot-docker-compose.yml b/src/main/resources/docker/boot-docker-compose.yml new file mode 100644 index 0000000..2658886 --- /dev/null +++ b/src/main/resources/docker/boot-docker-compose.yml @@ -0,0 +1,12 @@ +version: '1' +services: + boot_docker_compose: + image: remaindertime/boot_docker_compose:v1.0.0 + container_name: boot_docker_compose + environment: + - SERVER_ADDRESS=120.48.109.209 + - MYSQL_NAME=root + - MYSQL_PWD=123456 + - REDIS_PWD=123456 + ports: + - 8090:8088 \ No newline at end of file diff --git a/src/main/resources/docker/docker-compose.yml b/src/main/resources/docker/elk_docker-compose.yml similarity index 100% rename from src/main/resources/docker/docker-compose.yml rename to src/main/resources/docker/elk_docker-compose.yml diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 3648628..5828405 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -54,7 +54,7 @@ var json = JSON.stringify(data); var cipher = this.encryptByPublicKey(json); console.log("密文 ：" + cipher); - var url = "http://localhost:8088/user/login"; + var url = "http://120.48.109.209:8088/user/login"; axios.post(url, { encryptedData: cipher, })