Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-company/src/main/resources/application.yml

fs-company/src/main/resources/application.yml

@@ -3,13 +3,13 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: druid-fcky-test
+#    active: druid-jnsyj-test
 #    active: druid-jnmy-test
 #    active: druid-jzzx-test
 #    active: druid-hdt
-#    active: druid-sxjz
+    active: druid-sxjz-test
 #    active: druid-yzt
 #    active: druid-myhk
 #    active: druid-sft
-    active: dev
+#    active: dev-jnlzjk
 #    active: dev-yjb

fs-service/src/main/resources/application-config-druid-ddgy.yml

@@ -91,8 +91,8 @@ cloud_host:
 headerImg:
   imgUrl: https://ddgy-1323137866.cos.ap-chongqing.myqcloud.com/fs/20251010/ddgy.jpg
 ipad:
-  ipadUrl: http://ipad.****.cn
-  aiApi: http://62:3000/api
+  ipadUrl: http://ipad.dingdangtcm.cn
+  aiApi: http://
   voiceApi:
   commonApi:
 wx_miniapp_temp:

fs-service/src/main/resources/application-druid-yxj.yml

@@ -4,7 +4,7 @@ spring:
         include: config-druid-yxj,common
     # redis 配置
     redis:
-        host: 172.17.0.4
+        host: 172.16.16.15
         port: 6379
         # 数据库索引
         database: 0
@@ -39,13 +39,13 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://172.16.0.7:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.16.16.13:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz_tM818782145I@
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
-                    url: jdbc:mysql://172.16.0.16:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.16.0.27:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz_tM818782145I@
                 # 初始连接数
@@ -93,7 +93,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://172.16.0.7:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    url: jdbc:mysql://172.16.16.13:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz_tM818782145I@
                 # 初始连接数

fs-service/src/main/resources/mapper/fastGpt/FastgptEventLogTotalMapper.xml

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where token_type = 0
             <if test="roleId != null "> and role_id = #{roleId}</if>
             <if test="roleId == null "> and role_id is not null</if>
-            <if test="createTime != null "> and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime})</if>
+            <if test="createTime != null "> and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{createTime}, '%Y-%m-%d')</if>
             <if test="beginTime != null and endTime != null"> <![CDATA[and DATE_FORMAT(create_time, '%Y-%m-%d') > DATE_FORMAT(#{beginTime}, '%Y-%m-%d')
                                                                  and DATE_FORMAT(create_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d') ]]></if>
             <if test="companyId != null "> and company_id = #{companyId}</if>