refactor(项目管理): 更新数据源配置&ui配置误报国际化
This commit is contained in:
parent
0f0f284059
commit
064894fa3b
|
@ -102,6 +102,7 @@ functional_case_template_extend.id.not_blank=ID is required
|
|||
functional_case_template_extend.step_model.length_range=Step Model length must be between {min} and {max}
|
||||
functional_case_template_extend.step_model.not_blank=Step Model is required
|
||||
project_is_null=Project does not exist
|
||||
fake_error_name_exist=Fake error name already exists
|
||||
# robot
|
||||
robot_is_null=The current robot does not exist
|
||||
ding_type_is_null= DingTalk robot type is required
|
||||
|
|
|
@ -102,6 +102,7 @@ functional_case_template_extend.id.not_blank=ID不能为空
|
|||
functional_case_template_extend.step_model.length_range=步骤模型长度必须在{min}-{max}之间
|
||||
functional_case_template_extend.step_model.not_blank=步骤模型不能为空
|
||||
project_not_exist=项目不存在
|
||||
fake_error_name_exist=误报名称已存在
|
||||
# robot
|
||||
robot_is_null=当前机器人不存在
|
||||
ding_type_is_null=钉钉机器人的类型不能为空
|
||||
|
|
|
@ -102,6 +102,7 @@ functional_case_template_extend.id.not_blank=ID不能為空
|
|||
functional_case_template_extend.step_model.length_range=步驟模型長度必須在{min}-{max}之間
|
||||
functional_case_template_extend.step_model.not_blank=步驟模型不能為空
|
||||
project_is_null=項目不存在
|
||||
fake_error_name_exist=誤報名稱已存在
|
||||
# robot
|
||||
robot_is_null=當前機器人不存在
|
||||
ding_type_is_null=釘釘機器人的類型不能為空
|
||||
|
|
|
@ -13,7 +13,7 @@ quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock=true
|
|||
#
|
||||
logging.file.path=/opt/metersphere/logs/metersphere
|
||||
# Hikari
|
||||
spring.datasource.url=jdbc:mysql://${embedded.mysql.host}:${embedded.mysql.port}/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
|
||||
spring.datasource.url=jdbc:mysql://${embedded.mysql.host}:${embedded.mysql.port}/test?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&sessionVariables=sql_mode=%27STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION%27
|
||||
spring.datasource.username=${embedded.mysql.user}
|
||||
spring.datasource.password=${embedded.mysql.password}
|
||||
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
</select>
|
||||
|
||||
<select id="getUserListByOrgId" resultType="io.metersphere.system.domain.User">
|
||||
SELECT
|
||||
SELECT DISTINCT
|
||||
u.id,
|
||||
u.NAME,
|
||||
u.email
|
||||
|
|
Loading…
Reference in New Issue