Merge branch 'nh'
# Conflicts: # src/main/resources/application.properties
This commit is contained in:
@ -42,8 +42,13 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
|
||||
|
||||
management.health.rabbit.enabled=false
|
||||
|
||||
# 单个文件最大大小
|
||||
spring.servlet.multipart.max-file-size=10MB
|
||||
# 单次请求最大大小(可包含多个文件)
|
||||
spring.servlet.multipart.max-request-size=15MB
|
||||
|
||||
# 文件上传配置
|
||||
spring.servlet.multipart.enabled=true
|
||||
spring.servlet.multipart.max-file-size=100MB
|
||||
spring.servlet.multipart.max-request-size=100MB
|
||||
|
||||
# 激活开发环境!告诉 Spring:加载 application-dev.properties 里的配置
|
||||
spring.profiles.active=dev
|
||||
|
||||
|
||||
|
@ -18,6 +18,6 @@
|
||||
<if test="status != null">
|
||||
status=#{status}
|
||||
</if>
|
||||
where model_id=#{id}
|
||||
where id=#{id}
|
||||
</update>
|
||||
</mapper>
|
@ -44,16 +44,22 @@
|
||||
<update id="update">
|
||||
UPDATE model_version
|
||||
<set>
|
||||
<if test="modelSize != null">
|
||||
model_size = #{modelSize},
|
||||
</if>
|
||||
<if test="modelSuperArgs != null">
|
||||
model_super_args = #{modelSuperArgs},
|
||||
</if>
|
||||
<if test="modelArgsSize != null">
|
||||
model_args_size = #{modelArgsSize},
|
||||
</if>
|
||||
<if test="datasetId != null">dataset_id = #{datasetId},</if>
|
||||
<if test="modelConfig != null">model_config = #{modelConfig},</if>
|
||||
<if test="modelPath != null">model_path = #{modelPath},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="modelSize != null">model_size = #{modelSize},</if>
|
||||
<if test="dataPreHandleFile != null">data_pre_handle_file = #{dataPreHandleFile},</if>
|
||||
<if test="modelSuperArgs != null">model_super_args = #{modelSuperArgs},</if>
|
||||
<if test="modelArgsSize != null">model_args_size = #{modelArgsSize},</if>
|
||||
<if test="modelSourceCodeUrl != null">model_source_code_url = #{modelSourceCodeUrl},</if>
|
||||
<if test="modelFile != null">model_file = #{modelFile},</if>
|
||||
<if test="modelDesignDocument != null">model_design_document = #{modelDesignDocument},</if>
|
||||
<if test="lifeCycle != null">life_cycle = #{lifeCycle},</if>
|
||||
<if test="operateUser != null">operate_user = #{operateUser},</if>
|
||||
</set>
|
||||
WHERE id = #{id
|
||||
WHERE id = #{id}
|
||||
</update>
|
||||
</mapper>
|
Reference in New Issue
Block a user