From afdae31394ba3ea74c6738af6a7588baec0a6f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Wed, 15 Feb 2023 14:39:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B2=97=E4=BD=8D?=
 =?UTF-8?q?=E6=80=BB=E4=BD=93=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/rzyc/model/log/SysLogs.java |  2 ++
 .../resources/mapper/ent/SysEnterpriseMapper.xml  |  5 ++++-
 .../java/com/rzyc/service/PcBusinessService.java  |  3 +++
 .../src/main/resources/application-prod.yml       | 15 +++++++++++++++
 inventory-ent/src/main/resources/application.yml  |  2 +-
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/inventory-dao/src/main/java/com/rzyc/model/log/SysLogs.java b/inventory-dao/src/main/java/com/rzyc/model/log/SysLogs.java
index 79548a7..ca01a2e 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/log/SysLogs.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/log/SysLogs.java
@@ -1,5 +1,6 @@
 package com.rzyc.model.log;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -38,6 +39,7 @@ public class SysLogs implements Serializable {
     @ApiModelProperty("ip地址")
     private String ipAddress;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("时间")
     private Date createTime;
 
diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
index c22b9c3..7a85171 100644
--- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml
@@ -2608,7 +2608,10 @@
   </select>
 
   <select id="findEnterpriseByPhoneNumber" resultMap="BaseResultMap">
-    select sysent.EntName,sysent.state,sysent.SysEnterpriseId,sysent.EntName from ent_user eu left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId where eu.mobile = #{entUserPhone}
+    select sysent.EntName,sysent.state,sysent.SysEnterpriseId,sysent.EntName
+    from ent_user eu
+        left join sysenterprise sysent on eu.enterprise_id = sysent.SysEnterpriseId
+    where eu.account = #{entUserPhone}
   </select>
 
   <insert id="insertList">
diff --git a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
index df763db..6cb1161 100644
--- a/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
+++ b/inventory-ent/src/main/java/com/rzyc/service/PcBusinessService.java
@@ -205,6 +205,9 @@ public class PcBusinessService extends BaseController {
     @PageOperation
     public SingleResult entUserList(String keyContent,Integer page,Integer pageSize,String postId,String enterpriseId,Integer userType){
         SingleResult singleResult = new SingleResult();
+        if("company".equals(postId) ){
+            postId = "";
+        }
         Page<EntUser>users = (Page<EntUser>) entUserMapper.selectEntUserList(keyContent,postId,enterpriseId,userType);
         //计算履职百分比,后期这里使用redis来读取履职进度
         for (EntUser e:users.getResult()) {
diff --git a/inventory-ent/src/main/resources/application-prod.yml b/inventory-ent/src/main/resources/application-prod.yml
index 82057d7..1907494 100644
--- a/inventory-ent/src/main/resources/application-prod.yml
+++ b/inventory-ent/src/main/resources/application-prod.yml
@@ -2,6 +2,21 @@ server:
   port: 7011
 
 spring:
+  redis:
+    host: 42.193.40.239
+    Auth: redis@rzyc123456
+    #    进入哨兵项目-这个端口就不用了，除非是单体
+    #    port: 6379
+    sentinel:
+      master: mymaster
+      nodes: 42.193.40.239:26379,42.193.40.239:26380,42.193.40.239:26381
+    lettuce:
+      pool:
+        max-active: 8
+        max-idle: 8
+        min-idle: 0
+        max-wait: 100
+      shutdown-timeout: 50000
   servlet:
     multipart:
       enabled: true
diff --git a/inventory-ent/src/main/resources/application.yml b/inventory-ent/src/main/resources/application.yml
index a6560f0..a703748 100644
--- a/inventory-ent/src/main/resources/application.yml
+++ b/inventory-ent/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev #设定打包配置文件
+    active: prod #设定打包配置文件