DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -787,6 +787,7 @@ param.put("width", 430); //二维码尺寸 param.put("scene", "driverId=" + uid); param.put("env_version", "release"); //正式版为 "release"，体验版为 "trial"，开发版为 "develop"。默认是正式版。 param.put("check_path",false); // todo 正式版上面的后面的路径不存在，则不需要检查路径，上线后会存在 HttpRequest post = HttpUtil.createPost(url); post.body(JSON.toJSONString(param)); @@ -800,8 +801,9 @@ index=1; String url1 = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + accessToken; Map<String, Object> param1 = new HashMap<>(); param1.put("path", "pages/home/home"); param1.put("query", "driverId=" + uid); // todo 正式版下面的路径不存在，则不需要检查路径，上线后会存在，需要放开 /* param1.put("path", "pages/home/home"); param1.put("query", "driverId=" + uid);*/ HttpRequest post = HttpUtil.createPost(url1); // map转json DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -438,7 +438,8 @@ if(orderType == 3){ aDouble = aDouble * split.length; } baseWarpper.setAmount(aDouble); baseWarpper.setAmount(null); // todo 放心行项目，客户要求：1.改派订单系统默认成0，然后屏蔽掉后台设置改派金额入口。2.司机端代客下单屏蔽掉司机代付入口 // baseWarpper.setAmount(aDouble); return ResultUtil.success(baseWarpper); }catch (Exception e){ e.printStackTrace(); DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WeChatUtil.java
@@ -29,9 +29,9 @@ @Component public class WeChatUtil { private String wxAppletsAppid="wx20301e30167d920e"; private String wxAppletsAppid="wx0de58018e30d92ca"; private String wxAppletsAppSecret="4b8fe5cea20c4309fa996caa06ac9b4c"; private String wxAppletsAppSecret="add17fe80420beb099d24d0cc17d0f6f"; @Autowired private RestTemplate restTemplate; @@ -52,7 +52,7 @@ * @return */ public Map<String, String> code2Session(String jscode){ String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + "wx20301e30167d920e" + "&secret=" + "4b8fe5cea20c4309fa996caa06ac9b4c" String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + "wx0de58018e30d92ca" + "&secret=" + "add17fe80420beb099d24d0cc17d0f6f" + "&js_code=" + jscode + "&grant_type=authorization_code"; String forObject = restTemplate.getForObject(url, String.class); JSONObject jsonObject = JSON.parseObject(forObject); @@ -98,7 +98,7 @@ String content = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + url; String signature = DigestUtils.sha1Hex(content); Map<String,Object> map=new HashMap<>(); map.put("appId", "wx20301e30167d920e"); map.put("appId", "wx0de58018e30d92ca"); map.put("timestamp", timestamp); map.put("nonceStr", noncestr); map.put("signature", signature); DriverYKDTravel/guns-admin/src/main/resources/application-prod.yml
@@ -1,13 +1,13 @@ server: port: 8007 tomcat: basedir: /etraffic/server/chuxing/tomcat basedir: /home/fangxinxing/server/tomcat guns: swagger-open: false #是否开启swagger (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: http://192.168.0.43/resources/ #图片服务器地址 file-upload-path: /home/fangxinxing/server/resources #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: https://ride.cbyzx.com/resources/ #图片服务器地址 spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 @@ -32,8 +32,8 @@ max-file-size: 100MB redis: host: 127.0.0.1 port: 6410 password: Qnz_jt@20#25 port: 6379 password: 123456 database: 0 timeout: 1000 @@ -58,21 +58,18 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:8066/yuekeduo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: YueKeDuo@2026!. db-name: yuekeduo #用来搜集数据库的所有表 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://fxx-mysql.cb-inner.com:3306/fxx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: fxx password: "J7#kL8@qR2$vN5&pT!" db-name: fxx #用来搜集数据库的所有表 filters: wall,mergeStat --- spring: data: mongodb: host: 127.0.0.1 port: 27009 username: qnjt_ridingmgdb password: qnjtriding@Prom2025 database: qnjt_ridingmgdb uri: mongodb://127.0.0.1:27017/traveling_track --- @@ -80,8 +77,8 @@ grantType: authorization_code #填authorization_code appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得 appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得 appletsAppid: wxccaecee088db18d5 #小程序APPid appletsAppSecret: c02390b36817fae7ccd27f084dfbd294 # appletsAppid: wx0de58018e30d92ca #小程序APPid appletsAppSecret: add17fe80420beb099d24d0cc17d0f6f # mchId: 111 #微信支付分配的商户号 key: 111 #key为商户平台设置的密钥key： url: https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1} @@ -108,7 +105,7 @@ appKey-dispatch: 111 #极光推送应用唯一标识 masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的 filePath: /etraffic/server/qytPdf/ filePath: /home/fangxinxing/server/qytpdf/ qyt: socket_uri: http://127.0.0.1:6000 @@ -117,9 +114,8 @@ #支付回调地址 #正式环境 callbackPath: https://rideapi.yuekeduo.com.cn/driver-server callbackPath: https://ride.cbyzx.com/driver --- #交通部推送数据功能开关 pushMinistryOfTransport: false pushMinistryOfTransport: false DriverYKDTravel/guns-admin/src/main/resources/logback.xml
@@ -7,8 +7,8 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/home/yuekeduo/server/chuxing/logs/driver"/> <!-- <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/driver"/>--> <property name="log.path" value="/home/fangxinxing/server/java/logs/driver"/> <!-- <property name="log.path" value="/Users/yanderong/works/temp"/>--> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 --> DriverYKDTravel/pom.xml
@@ -165,6 +165,11 @@ <artifactId>hutool-all</artifactId> <version>${hutool.version}</version> </dependency> <dependency> <groupId>com.aliyun</groupId> <artifactId>tea-util</artifactId> <version>0.2.22</version> </dependency> </dependencies> </dependencyManagement>
@@ -7,8 +7,8 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <!-- <property name="log.path" value="/home/yuekeduo/server/chuxing/logs/eureka"/>--> <property name="log.path" value="/Users/PC/Documents/etraffic/server/chuxing/logs/eureka"/> <property name="log.path" value="/home/fangxinxing/server/java/logs/eureka"/> <!-- <property name="log.path" value="/Users/yanderong/works/temp"/>--> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 --> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" /> ManagementYKDTravel/guns-admin/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@ server: port: 8010 tomcat: basedir: /etraffic/server/chuxing/tomcat basedir: /home/fangxinxing/server/tomcat servlet: session: cookie: @@ -13,8 +13,8 @@ spring-session-open: true #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 file-upload-path: /home/yuekeduo/server/resources #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: https://rideapi.yuekeduo.com.cn/resources/ #图片服务器地址 file-upload-path: /home/fangxinxing/server/resources #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: https://ride.cbyzx.com/resources/ #图片服务器地址 rest-url: http://139.9.249.67:8080/rest/ #前端接口调用基础路径 @@ -41,8 +41,8 @@ timeout: 7200 redis: host: 127.0.0.1 port: 6410 password: Qnz_jt@20#25 port: 6379 password: 123456 database: 0 timeout: 1000 @@ -58,10 +58,11 @@ --- spring: datasource: url: jdbc:mysql://127.0.0.1:8066/yuekeduo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: YueKeDuo@2026!. db-name: yuekeduo #用来搜集数据库的所有表 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://fxx-mysql.cb-inner.com:3306/fxx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: fxx password: "J7#kL8@qR2$vN5&pT!" db-name: fxx #用来搜集数据库的所有表 filters: wall,mergeStat @@ -69,11 +70,7 @@ spring: data: mongodb: host: 127.0.0.1 port: 27009 username: qnjt_ridingmgdb password: qnjtriding@Prom2025 database: qnjt_ridingmgdb uri: mongodb://127.0.0.1:27017/traveling_track --- @@ -81,8 +78,8 @@ grantType: authorization_code #填authorization_code appid: 1111 #应用唯一标识，在微信开放平台提交应用审核通过后获得 appSecret: 1111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得 appletsAppid: wx436cde5de45e1ed1 #小程序APPid appletsAppSecret: e94f587cfb5c325c13d72b1f5ddbb1e6 # appletsAppid: wx0de58018e30d92ca #小程序APPid appletsAppSecret: add17fe80420beb099d24d0cc17d0f6f # mchId: 1111 #微信支付分配的商户号 key: 1111 #key为商户平台设置的密钥key： @@ -103,8 +100,19 @@ #支付回调地址 #正式环境 callbackPath: https://traffic.qytzt.cn/chuxing callbackPath: https://ride.cbyzx.com/chuxing #交通部推送数据功能开关 pushMinistryOfTransport: false cos: secretId: AKIDofP7ezSmvtiNtDMLExUpALJCya0EHG3e secretKey: Sp481pRrRpBQzOekfPzPgmhR0GV9oKem region: ap-shanghai bucketName: cb-1358396420 baseUrl: https://cb-1358396420.cos.ap-shanghai.mvacloud.com # 大屏统计地址 embedded: route-switch-url: https://ride.cbyzx.com/home-html/#/?token= statistical-table-url: https://ride.cbyzx.com/home-html/#/statistical-table?token= ManagementYKDTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/home/yuekeduo/server/chuxing/logs/management"/> <property name="log.path" value="/home/fangxinxing/server/java/logs/management"/> <!-- <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/management"/>-->
@@ -425,7 +425,7 @@ </div> </div> <div class="reassigningSet" hidden> <div class="col-sm-3"> <div class="col-sm-3" hidden> 改派费用为 <input type="text" oninput="checkIsDouble(this)" @if(isNotEmpty(reformist)){ value="${reformist.money}" MessagePushTravel/src/main/resources/logback.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/home/yuekeduo/server/chuxing/logs/messagePush"/> <property name="log.path" value="/home/fangxinxing/server/java/logs/message"/> <!--0. 日志格式和颜色渲染 --> <!-- 彩色日志依赖的渲染类 --> <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" /> UserYKDTravel/guns-admin/src/main/resources/application-prod.yml
@@ -1,13 +1,13 @@ server: port: 8006 tomcat: basedir: /etraffic/server/chuxing/tomcat basedir: /home/fangxinxing/server/tomcat guns: swagger-open: false #是否开启swagger (true/false) kaptcha-open: false #是否开启登录时验证码 (true/false) file-upload-path: d:/tmp #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: http://192.168.0.43/resources/ #图片服务器地址 file-upload-path: /home/fangxinxing/server/resources #文件上传目录(不配置的话为java.io.tmpdir目录) picture-server-address: https://ride.cbyzx.com/resources/ #图片服务器地址 spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false) session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒 session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒 @@ -32,8 +32,8 @@ max-file-size: 100MB redis: host: 127.0.0.1 port: 6410 password: Qnz_jt@20#25 port: 6379 password: 123456 database: 0 timeout: 1000 @@ -60,10 +60,11 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:8066/yuekeduo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: root password: YueKeDuo@2026!. db-name: yuekeduo #用来搜集数据库的所有表 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://fxx-mysql.cb-inner.com:3306/fxx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai username: fxx password: "J7#kL8@qR2$vN5&pT!" db-name: fxx #用来搜集数据库的所有表 filters: wall,mergeStat @@ -71,12 +72,7 @@ spring: data: mongodb: host: 127.0.0.1 port: 27009 username: qnjt_ridingmgdb password: qnjtriding@Prom2025 database: qnjt_ridingmgdb uri: mongodb://127.0.0.1:27017/traveling_track --- @@ -85,8 +81,8 @@ grantType: authorization_code #填authorization_code appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得 appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得 appletsAppid: wx20301e30167d920e #小程序APPid appletsAppSecret: 4b8fe5cea20c4309fa996caa06ac9b4c # appletsAppid: wx0de58018e30d92ca #小程序APPid appletsAppSecret: add17fe80420beb099d24d0cc17d0f6f # mchId: 111 #微信支付分配的商户号 key: 111 #key为商户平台设置的密钥key： @@ -109,7 +105,7 @@ #支付回调地址 #正式环境 callbackPath: https://rideapi.yuekeduo.com.cn/user-server callbackPath: https://ride.cbyzx.com/user --- @@ -133,4 +129,4 @@ # pdf生成位置 trip: sheet: filePath: /etraffic/server/qytPdf/ filePath: /home/fangxinxing/server/qytpdf/ UserYKDTravel/guns-admin/src/main/resources/logback.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/home/yuekeduo/server/chuxing/logs/user"/> <property name="log.path" value="/home/fangxinxing/server/java/logs/user"/> <!-- <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/user"/>--> <!--0. 日志格式和颜色渲染 --> ZuulYKDTravel/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@ server: port: 5000 tomcat: basedir: /etraffic/server/chuxing/tomcat basedir: /home/fangxinxing/server/tomcat spring: profiles: ZuulYKDTravel/src/main/resources/logback.xml
@@ -7,7 +7,7 @@ <contextName>logback</contextName> <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 --> <property name="log.path" value="/home/yuekeduo/server/logs/zuul"/> <property name="log.path" value="/home/fangxinxing/server/java/logs/zuul"/> <!-- <property name="log.path" value="/Users/mitao/Documents/etraffic/server/chuxing/logs/zuul"/>--> <!--0. 日志格式和颜色渲染 -->
