diff --git a/backend/assembly/src/main/resources/application-dev.yml b/backend/assembly/src/main/resources/application-dev.yml index 61e4275..2b58b3c 100644 --- a/backend/assembly/src/main/resources/application-dev.yml +++ b/backend/assembly/src/main/resources/application-dev.yml @@ -5,18 +5,18 @@ spring: dynamic: datasource: master: + #开发环境配置 username: root password: Peony2021 -# password: Carbon@2024 driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://localhost:10002/lpg_dev?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true url: jdbc:mysql://123.60.140.65:10002/lpg_dev_1?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true -# url: jdbc:mysql://124.71.131.246:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true -# url: jdbc:mysql://localhost:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true + + #生产环境配置 # username: root -# password: Peony@2021 +# password: Carbon@2024 # driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://192.168.3.5:3306/lpg_dev?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true +# url: jdbc:mysql://localhost:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true + druid: filters: stat @@ -188,3 +188,16 @@ alisms: domain: 'dysmsapi.aliyuncs.com' sms-up-extend-code: '90997' template-code: 'SMS_467590230' + +qydp: + manageCode: qyfzr,qygl,czfzr + deliveryCode: psy,sqg + checkCode: xtgly + +qpsmlj: + dsfUrlPrefix: https://qp.cnjifen.cn/a.ashx?d= + +jdbcParam: + jdbcurl: jdbc:mysql://123.60.140.65:10002/lpg_dev_1 + username: root + password: Peony2021 diff --git a/backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml b/backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml index 845182a..3c64dfb 100644 --- a/backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml +++ b/backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml @@ -128,7 +128,7 @@ 6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(F_wd)) * COS( RADIANS(F_jd) - RADIANS(#{jd})) + SIN(RADIANS(#{wd})) * SIN( RADIANS(F_wd))) AS distance FROM w_station_regional_division - INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId + INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId and w_station_regional_division.F_regional_type = '经营区域' WHERE ST_Contains(w_station_regional_division.f_boundary, ST_GeomFromText(#{point}))