ZongYue / lpg

Download as
Browse Code »

Commit e95f453846db9d8cd048da3a8006fdf961984a50

Authored by lst
1 parent e2ec4dcd
Exists in dev

yml配置提交

Showing 2 changed files with 20 additions and 7 deletions   Show diff stats
backend/assembly/src/main/resources/application-dev.yml
  Diff comments   View file @e95f453
@@ -5,18 +5,18 @@ spring: @@ -5,18 +5,18 @@ spring:
5 dynamic: 5 dynamic:
6 datasource: 6 datasource:
7 master: 7 master:
  8 + #开发环境配置
8 username: root 9 username: root
9 password: Peony2021 10 password: Peony2021
10 -# password: Carbon@2024  
11 driver-class-name: com.mysql.cj.jdbc.Driver 11 driver-class-name: com.mysql.cj.jdbc.Driver
12 -# 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  
13 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 12 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
14 -# 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  
15 -# url: jdbc:mysql://localhost:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true 13 +
  14 + #生产环境配置
16 # username: root 15 # username: root
17 -# password: Peony@2021 16 +# password: Carbon@2024
18 # driver-class-name: com.mysql.cj.jdbc.Driver 17 # driver-class-name: com.mysql.cj.jdbc.Driver
19 -# 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 18 +# url: jdbc:mysql://localhost:13307/lpg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true
  19 +
20 20
21 druid: 21 druid:
22 filters: stat 22 filters: stat
@@ -188,3 +188,16 @@ alisms: @@ -188,3 +188,16 @@ alisms:
188 domain: 'dysmsapi.aliyuncs.com' 188 domain: 'dysmsapi.aliyuncs.com'
189 sms-up-extend-code: '90997' 189 sms-up-extend-code: '90997'
190 template-code: 'SMS_467590230' 190 template-code: 'SMS_467590230'
  191 +
  192 +qydp:
  193 + manageCode: qyfzr,qygl,czfzr
  194 + deliveryCode: psy,sqg
  195 + checkCode: xtgly
  196 +
  197 +qpsmlj:
  198 + dsfUrlPrefix: https://qp.cnjifen.cn/a.ashx?d=
  199 +
  200 +jdbcParam:
  201 + jdbcurl: jdbc:mysql://123.60.140.65:10002/lpg_dev_1
  202 + username: root
  203 + password: Peony2021
backend/lpg-user/src/main/resources/mapper/CzxxMapper.xml
  Diff comments   View file @e95f453
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(F_wd)) * COS( 128 6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(F_wd)) * COS(
129 RADIANS(F_jd) - RADIANS(#{jd})) + SIN(RADIANS(#{wd})) * SIN( RADIANS(F_wd))) AS distance 129 RADIANS(F_jd) - RADIANS(#{jd})) + SIN(RADIANS(#{wd})) * SIN( RADIANS(F_wd))) AS distance
130 FROM w_station_regional_division 130 FROM w_station_regional_division
131 - INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId 131 + INNER JOIN w_czxx ON w_czxx.ID_ = w_station_regional_division.f_ssczId and w_station_regional_division.F_regional_type = '经营区域'
132 WHERE 132 WHERE
133 ST_Contains(w_station_regional_division.f_boundary, ST_GeomFromText(#{point})) 133 ST_Contains(w_station_regional_division.f_boundary, ST_GeomFromText(#{point}))
134 <![CDATA[ AND (6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(w_czxx.F_wd)) * COS( 134 <![CDATA[ AND (6371 * ACOS( COS(RADIANS(#{wd})) * COS(RADIANS(w_czxx.F_wd)) * COS(