From c1c307fe42e8de9c9aac5c009e38ad405f934996 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 08 六月 2023 19:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/resources/application.yml | 16 ++++------------
management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js | 4 ++++
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index 64719ea..c343911 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/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
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js b/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
index 53f47c2..16a3346 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js
+++ b/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){
--
Gitblit v1.7.1