diff --git a/WebContent/WEB-INF/conf/db.properties b/WebContent/WEB-INF/conf/db.properties index 8c8c2eb..2e8f31d 100644 --- a/WebContent/WEB-INF/conf/db.properties +++ b/WebContent/WEB-INF/conf/db.properties @@ -5,8 +5,8 @@ #jdbc.username=root #jdbc.password=40342123 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver +#jdbc.url=jdbc:oracle:thin:@127.0.0.1:1521:orcl jdbc.url=jdbc:oracle:thin:@192.168.31.30:1521:orcl -#jdbc.url=jdbc:oracle:thin:@39.97.66.103:1521:orcl #jdbc.url=jdbc:oracle:thin:@47.92.168.204:30051:EE #jdbc.url=jdbc:oracle:thin:@47.104.236.109:1521:orcl jdbc.username=CLOUDS_HL diff --git a/WebContent/WEB-INF/ftl/_include/_t.ftl b/WebContent/WEB-INF/ftl/_include/_t.ftl index e4a6788..6c4670a 100644 --- a/WebContent/WEB-INF/ftl/_include/_t.ftl +++ b/WebContent/WEB-INF/ftl/_include/_t.ftl @@ -1,5 +1,5 @@ <#assign ctx=request.contextPath/> -<#assign rmsUrl=":8060"/> +<#assign rmsUrl=":18155"/> <#assign znfxUrl="39.97.66.43:8060/?IOTP=ZNFX"/> <#assign jcbgUrl="39.97.66.43:8060/WEBAPI/WebHandle/DataCountHandler.ashx"/> <#assign rmsUrlhttp="http://iot-xz.xfzn365.com/iot"/> \ No newline at end of file diff --git a/WebContent/WEB-INF/ftl/admin/sys/logRecord.ftl b/WebContent/WEB-INF/ftl/admin/sys/logRecord.ftl index 0d82c3e..655b100 100644 --- a/WebContent/WEB-INF/ftl/admin/sys/logRecord.ftl +++ b/WebContent/WEB-INF/ftl/admin/sys/logRecord.ftl @@ -51,7 +51,7 @@ layuiplus.on_w_1(function(){ url:"${ctx}/admin/sys/log/list", method:"get", cols:[[ - {field:"logTypename",title:"日志类型",unresize:true,width:160}, + /*{field:"logTypename",title:"日志类型",unresize:true,width:160},*/ {field:"logUseruid",title:"操作账号",unresize:true,width:160}, {field:"logTime",title:"操作时间",unresize:true,width:160}, {field:"logIp",title:"用户IP",unresize:true,width:160}, diff --git a/WebContent/WEB-INF/ftl/work/edit/edit_0.ftl b/WebContent/WEB-INF/ftl/work/edit/edit_0.ftl index 1f6d319..51da286 100644 --- a/WebContent/WEB-INF/ftl/work/edit/edit_0.ftl +++ b/WebContent/WEB-INF/ftl/work/edit/edit_0.ftl @@ -3,6 +3,7 @@