config(jg): 添加后台执行机器人账号配置并更新测试环境配置

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-vb.properties

@@ -33,9 +33,9 @@ spring.datasource.dynamic.datasource.openapi.username=admin
 spring.datasource.dynamic.datasource.openapi.password=Yeejoin@2023
 spring.datasource.dynamic.datasource.openapi.driver-class-name=cn.com.vastbase.Driver
 #ds tzs
-spring.datasource.dynamic.datasource.tzs.url=jdbc:vastbase://172.16.10.254:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.dynamic.datasource.tzs.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.dynamic.datasource.tzs.username=admin
-spring.datasource.dynamic.datasource.tzs.password=Yeejoin@2024
+spring.datasource.dynamic.datasource.tzs.password=Yeejoin@2023
 spring.datasource.dynamic.datasource.tzs.driver-class-name=cn.com.vastbase.Driver
 
 

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

+
+localhost=${spring.cloud.client.ip-address}
+#DB properties:
+spring.datasource.url=jdbc:postgresql://172.16.10.254:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
+spring.datasource.username=admin
+spring.datasource.password=Yeejoin@2024
+spring.datasource.hikari.register-mbeans=true
+eureka.client.service-url.defaultZone=http://admin:a1234560@172.16.10.230:10001/eureka/
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://${localhost}:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://${localhost}:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=${localhost}
+## ES properties:
+elasticsearch.username=elastic
+elasticsearch.password=a123456
+spring.elasticsearch.rest.uris=http://172.16.10.243:9200
+## unit(h)
+alertcall.es.synchrony.time=48
+#redis properties:
+spring.redis.mode= cluster
+spring.redis.cluster.nodes=172.16.10.231:6377,172.16.10.231:6378,172.16.10.231:6379,172.16.10.232:6377,172.16.10.232:6378,172.16.10.232:6379,172.16.10.233:6377,172.16.10.233:6378,172.16.10.233:6379
+spring.redis.password=Yeejoin@2023
+spring.redis.cluster.max-redirects=3
+spring.redis.timeout=10000
+spring.redis.lettuce.cluster.refresh.adaptive=true
+spring.redis.lettuce.cluster.refresh.period=2000
+
+## emqx properties:
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.231:2883
+emqx.client-user-name=root
+emqx.client-password=Yeejoin@2023
+emqx.keepAliveInterval=1000
+tzs.cti.appkey=4e805006-3fef-ae43-3915-a153731007c4
+tzs.cti.secretkey=7bd29115-99ee-4f7d-1fb1-7c4719d5f43a
+tzs.cti.url=http://36.41.172.83:8000
+##wechatToken
+tzs.wechat.token=yeejoin_2021
+##wechatTicketUrl
+tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
+#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
+tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
+tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
+#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
+tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
+tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
+#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
+tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
+tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
+mqtt.topic.task.newtask=tzs-task-newtask
+mqtt.topic.task.personinfo=tzs-task-personinfo
+mqtt.topic.elevator.push=/tzs/tcb_elevator
+mqtt.topic.alertInfo.push=/tzs/tcb_alertInfo
+mqtt.topic.alertReport.push=/tzs/tcb_alertReport
+mqtt.topic.alertHeart.push=/tzs/tcb_alertHeart
+mqtt.topic.alertMatrix.push=/tzs/tcb_alertMatrix
+mqtt.topic.cti.push=/cti/record
+cti.user.name=tzs_cti
+cti.user.pwd=a1234567
+flc.sms.tempCode=SMS_TZS_0001
+## ??????id
+tzs.wechat.tempId.warning=-pHsHLIjW8j-_AemoZycf6Dmu6iYc-YWWaJ0cAPGeUY
+##??????
+tzs.wechat.tempId.supervise=P5XGbszS2Pc6kynvGjzPpZ--ikAwDZo6O7WdJ2EUxtE
+## ???????id???userId?
+tzs.wechat.test.userId=3413513
+##new properties
+org.filter.group.seq=1564150103147573249
+fileserver.domain=http://172.16.10.243:19000/
+log.level=INFO
+duty.seats.role.ids=1585956200472674305,1585956257590706177
+## ???? properties:
+rule.definition.load=false
+##rule.definition.model-package=com.yeejoin.amos.boot.module.jcs.api.dto
+rule.definition.default-agency=tzs
+rule.definition.local-ip=172.16.10.243
+# minio ??
+minio.endpoint=http://172.16.10.243:9000
+minio.accessKey=root
+minio.secretKey=Yeejoin@2020
+## \u7279\u79CD\u8BBE\u5907\u57DF\u540D
+tzs.domain=http://sxtzsb.sxsei.com
+
+outSystem.user.password=a1234560
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=STUDIO_APP_WEB
+
+#Seata Config
+seata.tx-service-group= tzs-seata
+seata.service.grouplist.tzs-seata=172.16.10.231:8091
+
+# ??????(0<=datacenter-id<=31)
+mybatis-plus.global-config.datacenter-id=1
+# ??????(0<=worker-id<=31)
+mybatis-plus.global-config.worker-id=2
\ No newline at end of file

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

@@ -113,6 +113,11 @@ spring.security.user.name=admin
 spring.security.user.password=a1234560
 spring.security.user.roles=SBA_ADMIN
 
+## \u540E\u53F0\u6267\u884C\u673A\u5668\u4EBA\u8D26\u53F7\u914D\u7F6E
+amos.system.user.user-name=admin_jg
+amos.system.user.password=Yeejoin@2023
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=AMOS_STUDIO_WEB
 
 amos.operation.log=$share/${spring.application.name}//amos/operation/log
 amos.agency.code=tzs

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/logback-test.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/jg.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <!--日志文件大小-->
+            <MaxFileSize>30mb</MaxFileSize>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) --- %magenta([%thread]) %cyan([%-40.40logger{39},%method,%line]) : %msg%n</pattern>
+        </layout>
+    </appender>
+<!--    &lt;!&ndash; ELK管理 &ndash;&gt;-->
+<!--    <appender name="ELK" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>172.16.10.210:4560</destination>-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>-->
+<!--    </appender>-->
+    <!--    show parameters for hibernate sql 专为 Hibernate 定制
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder"  level="TRACE" />
+    <logger name="org.hibernate.type.descriptor.sql.BasicExtractor"  level="DEBUG" />
+    <logger name="org.hibernate.SQL" level="DEBUG" />
+    <logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+    <logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+    -->
+    <!--myibatis log configure-->
+    <logger name="org.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+    <logger name="org.apache.activemq" level="INFO"/>
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <!-- <appender-ref ref="FILE" /> -->
+        <appender-ref ref="STDOUT" />
+<!--        <appender-ref ref="ELK" />-->
+    </root>
+</configuration>
\ No newline at end of file