Merge remote-tracking branch 'origin/1.1' into 1.1

xuhy

2023-06-08 c1c307fe42e8de9c9aac5c009e38ad405f934996

Merge remote-tracking branch 'origin/1.1' into 1.1

 management/guns-admin/src/main/resources/application.yml

@@ -15,8 +15,8 @@

spring:
  profiles:
#    active: dev
    active: produce
    active: dev
#    active: produce
  mvc:
    static-path-pattern: /static/**
    view:
@@ -46,22 +46,14 @@
  map:
    key: e0370a9a4d10739045fb0b8f4742a67e #高德key

#eureka:
#  client:
#    service-url: #注册中心地址
#      defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
#    register-with-eureka: true #在注册中心进行注册
#    fetch-registry: true #从Eureka中获取注册信息。


---

spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
#    password: 123456
#    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
    password: 123456
    db-name: super_save_driving #用来搜集数据库的所有表
    filters: wall,mergeStat


 management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js

@@ -302,6 +302,10 @@
    if(!this.validate()){
        return ;
    }
    if(this.tAgentInfoData.userType == 0){
        delete this.tAgentInfoData.socialCreditCodeExpires;
        delete this.tAgentInfoData.certIdExpires;
    }

    //提交信息
    var ajax = new $ax(Feng.ctxPath + "/tAgent/add", function(data){