修复

4 months ago · 6728908450
--- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java
+++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java
@ -58,12 +58,12 @@ public class MpWxPayService {
        request.setDetail(productName);       //商品详情
        request.setTotalFee(price);           //总金额|分计
        request.setSpbillCreateIp(clientIp);  //终端IP
        request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/post/notify");//设置回调路径
        request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/post/notify");//设置回调路径
        request.setProductId(productId);      //商品id
        if (dev) {
            request.setTotalFee(price);
 //            request.setNotifyUrl(wxPay.notifyUrlDev);
            request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/post/notify");
            request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/post/notify");

        }
        try {
@ -99,13 +99,13 @@ public class MpWxPayService {
        request.setTotalFee(price);           //总金额|分计
        request.setSpbillCreateIp(clientIp);  //终端IP
 //        request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
        request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/post/notify");//设置回调路径
        request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/post/notify");//设置回调路径
        request.setProductId(productId);      //商品id
        request.setOpenid(openId);            //JSAPI OPENID
        if (dev){
            request.setTotalFee(price);
 //            request.setNotifyUrl(wxPay.notifyUrlDev);
            request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/post/notify");//设置回调路径
            request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/post/notify");//设置回调路径
        }
        try {
            Object order = wxPayService.createOrder(request);
@ -147,13 +147,13 @@ public class MpWxPayService {
        request.setTotalFee(price);           //总金额|分计
        request.setSpbillCreateIp(clientIp);  //终端IP
 //        request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径
        request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/order/notify");//设置回调路径
        request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/order/notify");//设置回调路径
        request.setProductId(productId);      //商品id
        request.setOpenid(openId);            //JSAPI OPENID
        if (dev){
            request.setTotalFee(price);
 //            request.setNotifyUrl(wxPay.notifyUrlDev);
            request.setNotifyUrl("https://admin.tiandufuwu.com/massage-api-tiandu/order/notify");//设置回调路径
            request.setNotifyUrl("https://admin.xiangfeidaoj.com/xian-fei/order/notify");//设置回调路径
        }
        try {
            Object order = wxPayService.createOrder(request);
--- a/han-hai-module-pay/src/main/resources/pay_weixin.properties
+++ b/han-hai-module-pay/src/main/resources/pay_weixin.properties
@ -5,10 +5,26 @@
 #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify
 #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify

 pay.mchId=1695565485
 pay.appId=wxe36bd1a3deea74a3
 pay.mchKey=26b451a9eea4b328f48dc864814895d8
 #pay.mchId=1695565485
 #pay.appId=wxe36bd1a3deea74a3
 #pay.mchKey=26b451a9eea4b328f48dc864814895d8
 #pay.keyPath=classpath:apiclient_cert.pem
 #pay.notifyUrl=https://admin.yixuandaojia.com/massage-api-three/post/create
 #pay.notifyUrlDev=https://admin.yixuandaojia.com/massage-api-three/post/notify

 #pay.mchId=1707279700
 #pay.appId=wxe6f4f95ad811ace6
 #pay.mchKey=0fdb77429ffdf206c151af76a663041c
 #pay.keyPath=classpath:apiclient_cert.pem
 #pay.notifyUrl=https://admin.xiangfeidaoj.com/xian-fei/post/create
 #pay.notifyUrlDev=https://admin.xiangfeidaoj.com/xian-fei/post/notify


 #????
 pay.mchId=1669760259
 pay.appId=wxe934cebcbc89d869
 pay.mchKey=78e4e80a2096b362114a7afeefd2ef24
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://admin.yixuandaojia.com/massage-api-three/post/create
 pay.notifyUrlDev=https://admin.yixuandaojia.com/massage-api-three/post/notify
 pay.notifyUrl=https://api.trdj1688.com/msg-admin/post/notify
 pay.notifyUrlDev=https://api.trdj1688.com/msg-admin/post/notify

--- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java
+++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java
@ -59,17 +59,31 @@ public class ApiLoginServiceImpl implements ApiLoginService {
    private HttpConf httpConf;


    /**
     * 微信公众号-appid - 天都服务
 //    /**
 //     * 微信公众号-appid - 天都服务
 //     */
 //
 //    private String mpAppId = "wx2cc6f138b02196e3";
 //
 //    /**
 //     * 微信公众号-appSecret- 天都服务
 //     */
 //
 //    private String mpAppSecret = "a5320a3c5ed0f90dfb9e0ead79d32945";



        /**
     * 微信公众号-appid - 泰柔到家
     */

    private String mpAppId = "wx2cc6f138b02196e3";
    private String mpAppId = "wxe934cebcbc89d869";

    /**
     * 微信公众号-appSecret- 天都服务
     * 微信公众号-appSecret- 泰柔到家
     */

    private String mpAppSecret = "a5320a3c5ed0f90dfb9e0ead79d32945";
    private String mpAppSecret = "78e4e80a2096b362114a7afeefd2ef23";


    /**
@ -171,30 +185,30 @@ public class ApiLoginServiceImpl implements ApiLoginService {
        baseBeleceService.save(belece);


        //从配置列表里面拿到满多少钱 //满多少可用
        String give_money = baseConfigService
                .lambdaQuery()
                .eq(MsgConfig::getKeyValue,"give_money")
                .one()
                .getContent();

        //可用金额
        String set_money = baseConfigService
                .lambdaQuery()
                .eq(MsgConfig::getKeyValue,"set_money")
                .one()
                .getContent();

        //创建优惠券
        MsgCoupon coupon = new MsgCoupon();
        coupon.setUserId(save.getId());
        coupon.setType("新用户满减券");
        coupon.setState(0);
        coupon.setMoney(new BigDecimal(set_money));
        coupon.setUseMoney(new BigDecimal(give_money));
        coupon.setCreateTime(new Date());

        baseCouponService.save(coupon);
 //        //从配置列表里面拿到满多少钱 //满多少可用
 //        String give_money = baseConfigService
 //                .lambdaQuery()
 //                .eq(MsgConfig::getKeyValue,"give_money")
 //                .one()
 //                .getContent();
 //
 //        //可用金额
 //        String set_money = baseConfigService
 //                .lambdaQuery()
 //                .eq(MsgConfig::getKeyValue,"set_money")
 //                .one()
 //                .getContent();

 //        //创建优惠券
 //        MsgCoupon coupon = new MsgCoupon();
 //        coupon.setUserId(save.getId());
 //        coupon.setType("新用户满减券");
 //        coupon.setState(0);
 //        coupon.setMoney(new BigDecimal(set_money));
 //        coupon.setUseMoney(new BigDecimal(give_money));
 //        coupon.setCreateTime(new Date());

 //        baseCouponService.save(coupon);



--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java
@ -249,13 +249,13 @@ public class UserVipApiServiceImpl implements UserVipApiService {
        if(StringUtils.isBlank(id)){
            return Result.error("技师标识不能为空");
        }
        MsgTechnician byId = msgTechnicianService.getById(id);
        MsgTechnician technician = msgTechnicianService.getById(id);
        //查询项目列表数据
 //        List<MsgShop> list = msgShopService.lambdaQuery()
 //                .list();
        MsgTechnician technician = msgTechnicianService.lambdaQuery()
                .eq(MsgTechnician::getUserId, hanHaiMember.getId())
                .one();
 //        MsgTechnician technician = msgTechnicianService.lambdaQuery()
 //                .eq(MsgTechnician::getUserId, byId.getId())
 //                .one();
        //技师不能为空
        if(technician==null){
            return Result.error("技师不存在");
@ -286,11 +286,11 @@ public class UserVipApiServiceImpl implements UserVipApiService {


        Map map = new HashMap();
        map.put("msgTechnician", byId);
        map.put("msgTechnician", technician);
        map.put("list",listShop);

        //查询是否已收藏技师
        MsgCollect one = msgCollectService.lambdaQuery().eq(MsgCollect::getTenId, byId.getId()).eq(MsgCollect::getUserId, hanHaiMember.getId()).one();
        MsgCollect one = msgCollectService.lambdaQuery().eq(MsgCollect::getTenId, technician.getId()).eq(MsgCollect::getUserId, hanHaiMember.getId()).one();
        if(one == null){
            map.put("collect", 0);
        }else{
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/SmsClient.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/utils/SmsClient.java
@ -20,9 +20,9 @@ public class SmsClient {

    public static  String send(String phone,String code) {
        SmsClient client = new SmsClient();
        String response = client.sendSms("tianduxx", Arrays.asList(
                new Message(phone, "【天都服务】您的验证码为："+code)
        ), System.currentTimeMillis(), "KXHQ2boE1wP6");
        String response = client.sendSms("tairoudj", Arrays.asList(
                new Message(phone, "【长沙泰柔到家】您的验证码为："+code)
        ), System.currentTimeMillis(), "evXRctaIoX22");
        System.out.println(response);
        return response;
    }
@ -30,9 +30,9 @@ public class SmsClient {

    public static  String sendMsg2(String phone,String name) {
        SmsClient client = new SmsClient();
        String response = client.sendSms("tianduxx", Arrays.asList(
                new Message(phone, "【天都服务】可爱的理疗师"+name+"您有一笔新订单下单哦!")
        ), System.currentTimeMillis(), "KXHQ2boE1wP6");
        String response = client.sendSms("tairoudj", Arrays.asList(
                new Message(phone, "【长沙泰柔到家】可爱的理疗师"+name+"您有一笔新订单下单哦!")
        ), System.currentTimeMillis(), "evXRctaIoX22");
        System.out.println(response);
        return response;
    }
--- a/jeecg-boot-module-system/src/main/resources/application-dev.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml
@ -1,5 +1,5 @@
 server:
  port: 8001
  port: 8002
  tomcat:
    max-swallow-size: -1
  error:
@ -7,7 +7,7 @@ server:
    include-stacktrace: ALWAYS
    include-message: ALWAYS
  servlet:
    context-path: /massage-api-tiandu
    context-path: /massage-api
  compression:
    enabled: true
    min-response-size: 1024
@ -134,9 +134,9 @@ spring:
      #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:mysql://111.229.66.185:3306/massage-api-tiandu?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
          url: jdbc:mysql://1.13.249.28:3306/msg-admin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
          username: root
          password: tiandufuwu.123456
          password: G4xu&xza
          driver-class-name: com.mysql.cj.jdbc.Driver
          # 多数据源配置
          #multi-datasource1:
@ -146,8 +146,8 @@ spring:
          #driver-class-name: com.mysql.cj.jdbc.Driver
  #redis 配置
  redis:
    database: 0
    host: 111.229.66.185
    database: 2
    host: 1.13.249.28
    lettuce:
      pool:
        max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
@ -155,7 +155,7 @@ spring:
        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
      shutdown-timeout: 1000ms
    password: 'tiandufuwu.123456'
    password: 'G4xu&xza'
    port: 6379
 #mybatis plus 设置
 mybatis-plus:
@ -192,11 +192,11 @@ jeecg :
    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
  #阿里云oss存储和大鱼短信秘钥配置
  oss:
    accessKey: LTAI5tB1Zbg4jR7iRMeyCz8g
    secretKey: 9KKdXCj0WikfHk9Du2jTlNHScSWTOD
    endpoint: oss-cn-guangzhou.aliyuncs.com
    bucketName: tiandufuwu
    staticDomain: https://image.tiandufuwu.com
    accessKey: LTAI5tQSs47izVy8DLVdwUU9
    secretKey: qHI7C3PaXYZySr84HTToviC71AYlFq
    endpoint: oss-cn-shenzhen.aliyuncs.com
    bucketName: hanhaiimage
    staticDomain: https://image.hhlm1688.com
  # ElasticSearch 6设置
  elasticsearch:
    cluster-name: jeecg-ES
@ -329,3 +329,14 @@ third-app:
      client-secret: ??
      agent-id: ??


 ##配置微信 - 泰柔到家
 wechat:
  mpAppId: wxe934cebcbc89d869
  mpAppSecret: 78e4e80a2096b362114a7afeefd2ef23
  mchId:
  mchKey:
  keyPath:
  notifyUrl:


--- a/jeecg-boot-module-system/src/main/resources/application-tiandui.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-tiandui.yml
@ -0,0 +1,331 @@
 server:
  port: 8001
  tomcat:
    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
    include-message: ALWAYS
  servlet:
    context-path: /massage-api-tiandu
  compression:
    enabled: true
    min-response-size: 1024
    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*

 management:
  endpoints:
    web:
      exposure:
        include: metrics,httptrace

 spring:
  servlet:
    multipart:
      max-file-size: 10MB
      max-request-size: 10MB
  mail:
    host: smtp.qq.com
    username:
    password:
    properties:
      mail:
        smtp:
          auth: true
          starttls:
            enable: true
            required: true
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
    initialize-schema: embedded
    #定时任务启动开关，true-开  false-关
    auto-startup: true
    #启动时更新己存在的Job
    overwrite-existing-jobs: true
    properties:
      org:
        quartz:
          scheduler:
            instanceName: MyScheduler
            instanceId: AUTO
          jobStore:
            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
            tablePrefix: QRTZ_
            isClustered: true
            misfireThreshold: 60000
            clusterCheckinInterval: 10000
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10
            threadPriority: 5
            threadsInheritContextClassLoaderOfInitializingThread: true
  #json 时间戳统一转换
  jackson:
    date-format:   yyyy-MM-dd HH:mm:ss
    time-zone:   GMT+8
  jpa:
    open-in-view: false
  activiti:
    check-process-definitions: false
    #启用作业执行器
    async-executor-activate: false
    #启用异步执行器
    job-executor-activate: false
  aop:
    proxy-target-class: true
  #配置freemarker
  freemarker:
    # 设置模板后缀名
    suffix: .ftl
    # 设置文档类型
    content-type: text/html
    # 设置页面编码格式
    charset: UTF-8
    # 设置页面缓存
    cache: false
    prefer-file-system-access: false
    # 设置ftl文件路径
    template-loader-path:
      - classpath:/templates
  # 设置静态文件路径，js,css等
  mvc:
    static-path-pattern: /**
    #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
    pathmatch:
      matching-strategy: ant_path_matcher
  resource:
    static-locations: classpath:/static/,classpath:/public/
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    druid:
      stat-view-servlet:
        enabled: true
        loginUsername: admin
        loginPassword: 123456
        allow:
      web-stat-filter:
        enabled: true
    dynamic:
      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
        # 连接池的配置信息
        # 初始化大小，最小，最大
        initial-size: 5
        min-idle: 5
        maxActive: 20
        # 配置获取连接等待超时的时间
        maxWait: 60000
        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
        timeBetweenEvictionRunsMillis: 60000
        # 配置一个连接在池中最小生存的时间，单位是毫秒
        minEvictableIdleTimeMillis: 300000
        validationQuery: SELECT 1
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        # 打开PSCache，并且指定每个连接上PSCache的大小
        poolPreparedStatements: true
        maxPoolPreparedStatementPerConnectionSize: 20
        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
        filters: stat,wall,slf4j
        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
      #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:mysql://111.229.66.185:3306/massage-api-tiandu?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
          username: root
          password: tiandufuwu.123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          # 多数据源配置
          #multi-datasource1:
          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          #username: root
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
  #redis 配置
  redis:
    database: 0
    host: 111.229.66.185
    lettuce:
      pool:
        max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
        max-idle: 0     #最大等待连接中的数量,设 0 为没有限制
        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
      shutdown-timeout: 1000ms
    password: 'tiandufuwu.123456'
    port: 6379
 #mybatis plus 设置
 mybatis-plus:
  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
  global-config:
    # 关闭MP3.0自带的banner
    banner: false
    db-config:
      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
      id-type: ASSIGN_ID
      # 默认数据库表下划线命名
      table-underline: true
  configuration:
    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # 返回类型为Map,显示null对应的字段
    call-setters-on-nulls: true
 #jeecg专用配置
 minidao :
  base-package: org.jeecg.modules.jmreport.*
 jeecg :
  # 是否启用安全模式
  safeMode: false
  # 签名密钥串(前后端要一致，正式发布请自行修改)
  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
  # 本地：local\Minio：minio\阿里云：alioss
  uploadType: alioss
  path :
    #文件上传根目录 设置
    upload: /opt/upFiles
    #webapp文件路径
    webapp: /opt/webapp
  shiro:
    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
  #阿里云oss存储和大鱼短信秘钥配置
  oss:
    accessKey: LTAI5tB1Zbg4jR7iRMeyCz8g
    secretKey: 9KKdXCj0WikfHk9Du2jTlNHScSWTOD
    endpoint: oss-cn-guangzhou.aliyuncs.com
    bucketName: tiandufuwu
    staticDomain: https://image.tiandufuwu.com
  # ElasticSearch 6设置
  elasticsearch:
    cluster-name: jeecg-ES
    cluster-nodes: 127.0.0.1:9200
    check-enabled: false
  # 表单设计器配置
  desform:
    # 主题颜色（仅支持 16进制颜色代码）
    theme-color: "#1890ff"
    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
    upload-type: system
    map:
      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
      baidu: ??
  # 在线预览文件服务器地址配置
  file-view-domain: 127.0.0.1:8012
  # minio文件上传
  minio:
    minio_url: http://minio.jeecg.com
    minio_name: ??
    minio_pass: ??
    bucketName: otatest
  #大屏报表参数设置
  jmreport:
    mode: dev
    #数据字典是否进行saas数据隔离，自己看自己的字典
    saas: false
    #是否需要校验token
    is_verify_token: true
    #必须校验方法
    verify_methods: remove,delete,save,add,update
    #自定义项目前缀
    customPrePath:
    pageSize:
      - 10
      - 20
      - 30
      - 40
  #Wps在线文档
  wps:
    domain: https://wwo.wps.cn/office/
    appid: ??
    appsecret: ??
  #xxl-job配置
  xxljob:
    enabled: false
    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
    appname: ${spring.application.name}
    accessToken: ''
    address: 127.0.0.1:30007
    ip: 127.0.0.1
    port: 30007
    logPath: logs/jeecg/job/jobhandler/
    logRetentionDays: 30
  route:
    config:
      data-id: jeecg-gateway-router
      group: DEFAULT_GROUP
      #自定义路由配置 yml nacos database
      data-type: database
  #分布式锁配置
  redisson:
    address: 127.0.0.1:6379
    password:
    type: STANDALONE
    enabled: true
 #cas单点登录
 cas:
  prefixUrl: http://cas.example.org:8443/cas
 #Mybatis输出sql日志
 logging:
  level:
    org.jeecg.modules.system.mapper : info
 #swagger
 knife4j:
  #开启增强配置
  enable: true
  #开启生产环境屏蔽
  production: false
  basic:
    enable: false
    username: jeecg
    password: jeecg1314
 #第三方登录
 justauth:
  enabled: true
  type:
    GITHUB:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
    WECHAT_ENTERPRISE:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
      agent-id: ??
    DINGTALK:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
    WECHAT_OPEN:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
  cache:
    type: default
    prefix: 'demo::'
    timeout: 1h
 #第三方APP对接
 third-app:
  enabled: false
  type:
    #企业微信
    WECHAT_ENTERPRISE:
      enabled: false
      #CORP_ID
      client-id: ??
      #SECRET
      client-secret: ??
      #自建应用id
      agent-id: ??
      #自建应用秘钥（新版企微需要配置）
      # agent-app-secret: ??
    #钉钉
    DINGTALK:
      enabled: false
      # appKey
      client-id: ??
      # appSecret
      client-secret: ??
      agent-id: ??

--- a/jeecg-boot-module-system/src/main/resources/application-xian-fei.yml
+++ b/jeecg-boot-module-system/src/main/resources/application-xian-fei.yml
@ -0,0 +1,331 @@
 server:
  port: 8000
  tomcat:
    max-swallow-size: -1
  error:
    include-exception: true
    include-stacktrace: ALWAYS
    include-message: ALWAYS
  servlet:
    context-path: /xian-fei
  compression:
    enabled: true
    min-response-size: 1024
    mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*

 management:
  endpoints:
    web:
      exposure:
        include: metrics,httptrace

 spring:
  servlet:
    multipart:
      max-file-size: 10MB
      max-request-size: 10MB
  mail:
    host: smtp.qq.com
    username:
    password:
    properties:
      mail:
        smtp:
          auth: true
          starttls:
            enable: true
            required: true
  ## quartz定时任务,采用数据库方式
  quartz:
    job-store-type: jdbc
    initialize-schema: embedded
    #定时任务启动开关，true-开  false-关
    auto-startup: true
    #启动时更新己存在的Job
    overwrite-existing-jobs: true
    properties:
      org:
        quartz:
          scheduler:
            instanceName: MyScheduler
            instanceId: AUTO
          jobStore:
            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
            tablePrefix: QRTZ_
            isClustered: true
            misfireThreshold: 60000
            clusterCheckinInterval: 10000
          threadPool:
            class: org.quartz.simpl.SimpleThreadPool
            threadCount: 10
            threadPriority: 5
            threadsInheritContextClassLoaderOfInitializingThread: true
  #json 时间戳统一转换
  jackson:
    date-format:   yyyy-MM-dd HH:mm:ss
    time-zone:   GMT+8
  jpa:
    open-in-view: false
  activiti:
    check-process-definitions: false
    #启用作业执行器
    async-executor-activate: false
    #启用异步执行器
    job-executor-activate: false
  aop:
    proxy-target-class: true
  #配置freemarker
  freemarker:
    # 设置模板后缀名
    suffix: .ftl
    # 设置文档类型
    content-type: text/html
    # 设置页面编码格式
    charset: UTF-8
    # 设置页面缓存
    cache: false
    prefer-file-system-access: false
    # 设置ftl文件路径
    template-loader-path:
      - classpath:/templates
  # 设置静态文件路径，js,css等
  mvc:
    static-path-pattern: /**
    #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
    pathmatch:
      matching-strategy: ant_path_matcher
  resource:
    static-locations: classpath:/static/,classpath:/public/
  autoconfigure:
    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
  datasource:
    druid:
      stat-view-servlet:
        enabled: true
        loginUsername: admin
        loginPassword: 123456
        allow:
      web-stat-filter:
        enabled: true
    dynamic:
      druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
        # 连接池的配置信息
        # 初始化大小，最小，最大
        initial-size: 5
        min-idle: 5
        maxActive: 20
        # 配置获取连接等待超时的时间
        maxWait: 60000
        # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
        timeBetweenEvictionRunsMillis: 60000
        # 配置一个连接在池中最小生存的时间，单位是毫秒
        minEvictableIdleTimeMillis: 300000
        validationQuery: SELECT 1
        testWhileIdle: true
        testOnBorrow: false
        testOnReturn: false
        # 打开PSCache，并且指定每个连接上PSCache的大小
        poolPreparedStatements: true
        maxPoolPreparedStatementPerConnectionSize: 20
        # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
        filters: stat,wall,slf4j
        # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
      #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:mysql://101.34.91.121:3306/xian-fei?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
          username: root
          password: xfdj.123456
          driver-class-name: com.mysql.cj.jdbc.Driver
          # 多数据源配置
          #multi-datasource1:
          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          #username: root
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
  #redis 配置
  redis:
    database: 0
    host: 101.34.91.121
    lettuce:
      pool:
        max-active: -1   #最大连接数据库连接数,设 -1 为没有限制
        max-idle: 0     #最大等待连接中的数量,设 0 为没有限制
        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
      shutdown-timeout: 1000ms
    password: 'xfdj.123456'
    port: 6379
 #mybatis plus 设置
 mybatis-plus:
  mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml
  global-config:
    # 关闭MP3.0自带的banner
    banner: false
    db-config:
      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
      id-type: ASSIGN_ID
      # 默认数据库表下划线命名
      table-underline: true
  configuration:
    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    # 返回类型为Map,显示null对应的字段
    call-setters-on-nulls: true
 #jeecg专用配置
 minidao :
  base-package: org.jeecg.modules.jmreport.*
 jeecg :
  # 是否启用安全模式
  safeMode: false
  # 签名密钥串(前后端要一致，正式发布请自行修改)
  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
  # 本地：local\Minio：minio\阿里云：alioss
  uploadType: alioss
  path :
    #文件上传根目录 设置
    upload: /opt/upFiles
    #webapp文件路径
    webapp: /opt/webapp
  shiro:
    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
  #阿里云oss存储和大鱼短信秘钥配置
  oss:
    accessKey: LTAI5tPcKv2buRrP5EewUt5k
    secretKey: YLhPp7ktRwAp5Umlou7Tu2QQrqd24P
    endpoint: oss-cn-shenzhen.aliyuncs.com
    bucketName: xiangfeidaoj
    staticDomain: https://img.xiangfeidaoj.com
  # ElasticSearch 6设置
  elasticsearch:
    cluster-name: jeecg-ES
    cluster-nodes: 127.0.0.1:9200
    check-enabled: false
  # 表单设计器配置
  desform:
    # 主题颜色（仅支持 16进制颜色代码）
    theme-color: "#1890ff"
    # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置）
    upload-type: system
    map:
      # 配置百度地图的AK，申请地址：https://lbs.baidu.com/apiconsole/key?application=key#/home
      baidu: ??
  # 在线预览文件服务器地址配置
  file-view-domain: 127.0.0.1:8012
  # minio文件上传
  minio:
    minio_url: http://minio.jeecg.com
    minio_name: ??
    minio_pass: ??
    bucketName: otatest
  #大屏报表参数设置
  jmreport:
    mode: dev
    #数据字典是否进行saas数据隔离，自己看自己的字典
    saas: false
    #是否需要校验token
    is_verify_token: true
    #必须校验方法
    verify_methods: remove,delete,save,add,update
    #自定义项目前缀
    customPrePath:
    pageSize:
      - 10
      - 20
      - 30
      - 40
  #Wps在线文档
  wps:
    domain: https://wwo.wps.cn/office/
    appid: ??
    appsecret: ??
  #xxl-job配置
  xxljob:
    enabled: false
    adminAddresses: http://127.0.0.1:9080/xxl-job-admin
    appname: ${spring.application.name}
    accessToken: ''
    address: 127.0.0.1:30007
    ip: 127.0.0.1
    port: 30007
    logPath: logs/jeecg/job/jobhandler/
    logRetentionDays: 30
  route:
    config:
      data-id: jeecg-gateway-router
      group: DEFAULT_GROUP
      #自定义路由配置 yml nacos database
      data-type: database
  #分布式锁配置
  redisson:
    address: 127.0.0.1:6379
    password:
    type: STANDALONE
    enabled: true
 #cas单点登录
 cas:
  prefixUrl: http://cas.example.org:8443/cas
 #Mybatis输出sql日志
 logging:
  level:
    org.jeecg.modules.system.mapper : info
 #swagger
 knife4j:
  #开启增强配置
  enable: true
  #开启生产环境屏蔽
  production: false
  basic:
    enable: false
    username: jeecg
    password: jeecg1314
 #第三方登录
 justauth:
  enabled: true
  type:
    GITHUB:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
    WECHAT_ENTERPRISE:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
      agent-id: ??
    DINGTALK:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
    WECHAT_OPEN:
      client-id: ??
      client-secret: ??
      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
  cache:
    type: default
    prefix: 'demo::'
    timeout: 1h
 #第三方APP对接
 third-app:
  enabled: false
  type:
    #企业微信
    WECHAT_ENTERPRISE:
      enabled: false
      #CORP_ID
      client-id: ??
      #SECRET
      client-secret: ??
      #自建应用id
      agent-id: ??
      #自建应用秘钥（新版企微需要配置）
      # agent-app-secret: ??
    #钉钉
    DINGTALK:
      enabled: false
      # appKey
      client-id: ??
      # appSecret
      client-secret: ??
      agent-id: ??

--- a/jeecg-boot-module-system/src/main/resources/pay_weixin.properties
+++ b/jeecg-boot-module-system/src/main/resources/pay_weixin.properties
@ -1,8 +1,16 @@
 pay.mchId=1704050725
 pay.appId=wx2cc6f138b02196e3
 pay.mchKey=0fdb77429ffdf206c151af76a663041c
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://admin.tiandufuwu.com/massage-api-tiandu/post/create
 pay.notifyUrlDev=https://admin.tiandufuwu.com/massage-api-tiandu/post/notify
 #pay.mchId=1704050725
 #pay.appId=wx2cc6f138b02196e3
 #pay.mchKey=0fdb77429ffdf206c151af76a663041c
 #pay.keyPath=classpath:apiclient_cert.pem
 #pay.notifyUrl=https://admin.tiandufuwu.com/massage-api-tiandu/post/create
 #pay.notifyUrlDev=https://admin.tiandufuwu.com/massage-api-tiandu/post/notify



 #????
 pay.mchId=1669760259
 pay.appId=wxe934cebcbc89d869
 pay.mchKey=78e4e80a2096b362114a7afeefd2ef24
 pay.keyPath=classpath:apiclient_cert.pem
 pay.notifyUrl=https://tai-testapi.sanhemovie.com/msg-admin/post/notify
 pay.notifyUrlDev=https://tai-testapi.sanhemovie.com/msg-admin/post/notify
--- a/shop/.env
+++ b/shop/.env
@ -1,5 +1,5 @@
 NODE_ENV=production
 VUE_APP_PLATFORM_NAME=天都服务
 VUE_APP_PLATFORM_NAME=湘妃到家
 # 开启单点登录
 VUE_APP_SSO=false
 # 开启微应用模式
--- a/shop/.env.development
+++ b/shop/.env.development
@ -1,5 +1,5 @@
 NODE_ENV=development
 VUE_APP_API_BASE_URL=http://localhost:8002/massage-api-tiandu/
 VUE_APP_API_BASE_URL=https://admin.xiangfeidaoj.com/xian-fei/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

--- a/shop/.env.production
+++ b/shop/.env.production
@ -1,4 +1,4 @@
 NODE_ENV=production
 VUE_APP_API_BASE_URL=http://localhost:8002/massage-api-tiandu/
 VUE_APP_API_BASE_URL=https://admin.xiangfeidaoj.com/xian-fei/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
--- a/shop/public/index.html
+++ b/shop/public/index.html
@ -5,7 +5,7 @@
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
  <title>天都服务后台管理系统</title>
  <title>湘妃到家后台管理系统</title>
  <link rel="icon" href="<%= BASE_URL %>logo.png">
  <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
  <style>
@ -249,7 +249,7 @@
    <div id="loader"></div>
    <div class="loader-section section-left"></div>
    <div class="loader-section section-right"></div>
    <div class="load_title">正在加载 天都服务后台管理系统,请耐心等待
    <div class="load_title">正在加载 湘妃到家后台管理系统,请耐心等待

    </div>
  </div>
--- a/shop/src/components/layouts/TabLayout.vue
+++ b/shop/src/components/layouts/TabLayout.vue
@ -177,7 +177,7 @@

      // update-begin-author:sunjianlei date:20200120 for: 动态更改页面标题
      changeTitle(title) {
        let projectTitle = "天都服务后台管理系统"
        let projectTitle = "湘妃到家后台管理系统"
        // 首页特殊处理
        if (this.$route.path === indexKey) {
          document.title = projectTitle
--- a/shop/src/components/layouts/UserLayout.vue
+++ b/shop/src/components/layouts/UserLayout.vue
@ -5,7 +5,7 @@
        <div class="header">
          <a href="/">
            <img src="~@/assets/logo.png" class="logo" alt="logo">
            <span class="title">天都服务后台管理系统</span>
            <span class="title">湘妃到家后台管理系统</span>
          </a>
        </div>
 <!--        <div class="desc">-->
--- a/shop/src/components/page/GlobalHeader.vue
+++ b/shop/src/components/page/GlobalHeader.vue
@ -17,8 +17,8 @@
        :type="collapsed ? 'menu-unfold' : 'menu-fold'"
        @click="toggle"/>

      <span v-if="device === 'desktop'">欢迎进入 天都服务后台管理系统</span>
      <span v-else>天都服务后台管理系统</span>
      <span v-if="device === 'desktop'">欢迎进入 湘妃到家后台管理系统</span>
      <span v-else>湘妃到家后台管理系统</span>

      <user-menu :theme="theme"/>
    </div>
--- a/shop/src/components/tools/Logo.vue
+++ b/shop/src/components/tools/Logo.vue
@ -21,7 +21,7 @@
    props: {
      title: {
        type: String,
        default: '天都服务',
        default: '湘妃到家',
        required: false
      },
      showTitle: {