1、服务端口修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev.properties

@@ -31,7 +31,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-dev3.properties

@@ -58,7 +58,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.230
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-jd.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.3.28
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/resources/application-qa.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=36.46.151.113
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-dev.properties

@@ -31,7 +31,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-dev3.properties

@@ -58,7 +58,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.230
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-jd.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.3.28
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/resources/application-qa.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=36.46.151.113
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/application-dev.properties

@@ -31,7 +31,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/application-dev3.properties

@@ -58,7 +58,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.230
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/application-jd.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.3.28
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/resources/application-qa.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=36.46.151.113
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsUserInfoMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsUserInfo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/AmosYmtApplication.java → amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/AmosTcmApplication.java

@@ -51,8 +51,8 @@ import java.net.UnknownHostException;
         "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
         "com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 @ComponentScan(basePackages = {"org.typroject", "com.yeejoin.amos"})
-public class AmosYmtApplication {
-    private static final Logger logger = LoggerFactory.getLogger(AmosYmtApplication.class);
+public class AmosTcmApplication {
+    private static final Logger logger = LoggerFactory.getLogger(AmosTcmApplication.class);
 
     @Autowired
     private EmqKeeper emqKeeper;
@@ -74,7 +74,7 @@ public class AmosYmtApplication {
 
 
     public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext context = SpringApplication.run(AmosYmtApplication.class, args);
+        ConfigurableApplicationContext context = SpringApplication.run(AmosTcmApplication.class, args);
         Environment env = context.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev.properties

@@ -31,7 +31,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-dev3.properties

@@ -58,7 +58,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.230
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-jd.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.3.28
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application-qa.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=36.46.151.113
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/application.properties

 spring.application.name=TZS-COMMON
 server.servlet.context-path=/tcm
-server.port=11005
+server.port=11001
 spring.profiles.active=dev3
 
 spring.jackson.time-zone=GMT+8

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-dev.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ymt.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/Tcm.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-dev2.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ymt.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/Tcm.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-dev3.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ymt.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/Tcm.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-jd.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ymt.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/Tcm.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/logback-qa.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ymt.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/Tcm.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-dev.properties

@@ -31,7 +31,7 @@ fileserver.domain=https://rpm.yeeamos.com:8888/
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.90
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-dev3.properties

@@ -58,7 +58,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.10.230
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-jd.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=172.16.3.28
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application-qa.properties

@@ -28,7 +28,7 @@ alertcall.es.synchrony.time=48
 #redis properties:
 spring.redis.database=1
 spring.redis.host=36.46.151.113
-spring.redis.port=6379
+spring.redis.port=16379
 spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/application.properties

 spring.application.name=TZS-YMT
 server.servlet.context-path=/ymt
-server.port=11001
+server.port=11000
 spring.profiles.active=dev3
 
 spring.jackson.time-zone=GMT+8