From 9df1a2176d0c1d2bf1a9549a6f8bd70e1f46827d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 六月 2023 13:42:38 +0800
Subject: [PATCH] 修改bug

---
 management/guns-admin/src/main/resources/application.yml                          |   16 ++++------------
 management/guns-admin/src/main/webapp/static/modular/system/tAgent/tAgent_info.js |    4 ++++
 management/guns-admin/src/main/resources/redis.properties                         |   22 +++++++++++-----------
 3 files changed, 19 insertions(+), 23 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/resources/redis.properties b/management/guns-admin/src/main/resources/redis.properties
index 4db967a..7d6a332 100644
--- a/management/guns-admin/src/main/resources/redis.properties
+++ b/management/guns-admin/src/main/resources/redis.properties
@@ -2,19 +2,19 @@
 # Redis���ݿ�������Ĭ��Ϊ0��
 spring.redis.database=0
 
-# Redis��������ַ
-spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-spring.redis.port=16379
-## Redis�������������루Ĭ��Ϊ�գ�
-spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
-
 ## Redis��������ַ
 #spring.redis.host=127.0.0.1
-## Redis���������Ӷ˿�
-#spring.redis.port=6379
-## Redis�������������루Ĭ��Ϊ�գ�
-#spring.redis.password=123456
+### Redis���������Ӷ˿�
+#spring.redis.port=16379
+### Redis�������������루Ĭ��Ϊ�գ�
+#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
+
+# Redis��������ַ
+spring.redis.host=127.0.0.1
+# Redis���������Ӷ˿�
+spring.redis.port=6379
+# Redis�������������루Ĭ��Ϊ�գ�
+spring.redis.password=123456
 
 # ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
 spring.redis.jedis.pool.max-active=1024
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