Merge remote-tracking branch 'origin/master'

This commit is contained in:
2022-08-01 17:00:19 +08:00
4 changed files with 21 additions and 0 deletions
@@ -234,6 +234,11 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl<Seawater> i
}catch(Exception e){
seawater.setHall(0);
}
try{
seawater.setToilet(source.getInt("toilet"));
}catch(Exception e){
seawater.setToilet(0);
}
try{
seawater.setpDate(source.getInt("p_date"));
}catch(Exception e){
@@ -0,0 +1,4 @@
{
"code": 400,
"msg": "Interface Not Found"
}
@@ -0,0 +1,4 @@
{
"code": 500,
"msg": "Server Inner Error"
}
@@ -90,4 +90,12 @@
<servlet-name>SafeCode</servlet-name>
<url-pattern>/randomCode</url-pattern>
</servlet-mapping>
<error-page>
<error-code>500</error-code>
<location>/500.json</location>
</error-page>
<error-page>
<error-code>404</error-code>
<location>/404.json</location>
</error-page>
</web-app>