master
mula.liu 2024-10-18 17:01:41 +08:00
parent 01e4db1415
commit 4e495c3eff
891 changed files with 509735 additions and 458924 deletions

BIN
.DS_Store vendored 100644

Binary file not shown.

50811
db/fourcal_db.sql 100644

File diff suppressed because one or more lines are too long

View File

@ -138,7 +138,7 @@ public class AdminController extends BaseController {
request.getSession().setAttribute("message", ""); request.getSession().setAttribute("message", "");
} }
message = login(userName, newPassword, false, false); message = login(userName, admin.getPassword(), false, false);
if (!message.isEmpty()) { if (!message.isEmpty()) {
attr.addAttribute("errorMessages", message); attr.addAttribute("errorMessages", message);

View File

@ -1,7 +1,7 @@
spring.datasource.url=jdbc:mysql://192.168.0.100:3306/fourcal?\ spring.datasource.url=jdbc:mysql://127.0.0.1:3306/fourcal?\
characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&useSSL=false characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&rewriteBatchedStatements=true&useSSL=false
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Qwer123!@#$ spring.datasource.password=sagacity
spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
#spring.jpa.properties.hibernate.hbm2ddl.auto=update #spring.jpa.properties.hibernate.hbm2ddl.auto=update

View File

@ -74,7 +74,7 @@
<td> <td>
<div class="am-btn-toolbar"> <div class="am-btn-toolbar">
<div class="am-btn-group am-btn-group-xs"> <div class="am-btn-group am-btn-group-xs">
<#if list.procDefKey! !='estimate' && list.procDefKey! !='budget' && list.procDefKey! !='settle' && list.procDefKey! !='final'> <#--<#if list.procDefKey! !='estimate' && list.procDefKey! !='budget' && list.procDefKey! !='settle' && list.procDefKey! !='final'>-->
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="design(${list.id?c})" > onclick="design(${list.id?c})" >
@ -88,7 +88,7 @@
<span class="am-icon-pencil-square-o"></span> <span class="am-icon-pencil-square-o"></span>
部署 部署
</button> </button>
</#if> <#--</#if>-->
</div> </div>
</div> </div>