diff --git a/config/common/email.properties b/config/common/email.properties deleted file mode 100644 index bd5300707..000000000 --- a/config/common/email.properties +++ /dev/null @@ -1,3 +0,0 @@ -stmp=smtp.126.com -emailname=accountnms@126.com -password=public \ No newline at end of file diff --git a/config/common/jdbc.properties b/config/common/jdbc.properties deleted file mode 100644 index 19baf067d..000000000 --- a/config/common/jdbc.properties +++ /dev/null @@ -1,4 +0,0 @@ -jdbcUrl= jdbc\:mysql\://localhost\:3306/jsh_erp?useUnicode\=true&characterEncoding\=UTF-8 -driverClass= com.mysql.jdbc.Driver -user= root -password=1234 \ No newline at end of file diff --git a/config/common/limitbasicdata.properties b/config/common/limitbasicdata.properties deleted file mode 100644 index 6177cad4a..000000000 --- a/config/common/limitbasicdata.properties +++ /dev/null @@ -1,5 +0,0 @@ -bigtypenum=20 -smalltypenum=20 -consumeForm=20 -consumePlace=20 -emailnum=20 \ No newline at end of file diff --git a/config/hibernate/hibernate.cfg.xml b/config/hibernate/hibernate.cfg.xml deleted file mode 100644 index a7f61903a..000000000 --- a/config/hibernate/hibernate.cfg.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - org.hibernate.dialect.MySQL5Dialect - - true - - update - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/i18n/messages_en_US.properties b/config/i18n/messages_en_US.properties deleted file mode 100644 index cf7909626..000000000 --- a/config/i18n/messages_en_US.properties +++ /dev/null @@ -1,7 +0,0 @@ -language=Select Language -enus=American English -zhcn=Simplified Chinese -logintitle=Welcome to the BenaMaid System -username=username -password=password -login_submit=login diff --git a/config/i18n/messages_zh_CN.properties b/config/i18n/messages_zh_CN.properties deleted file mode 100644 index b8211f37c..000000000 --- a/config/i18n/messages_zh_CN.properties +++ /dev/null @@ -1,7 +0,0 @@ -language=\u9009\u62e9\u8bed\u8a00 -enus=\u7f8e\u5f0f\u82f1\u8bed -zhcn=\u7b80\u4f53\u4e2d\u6587 -logintitle=\u6b22\u8fce\u5149\u4e34BenaMaid\u7cfb\u7edf -username=\u7528\u6237\u540d -password=\u5bc6\u7801 -login_submit=\u767b\u5f55 diff --git a/config/log4j/log4j.properties b/config/log4j/log4j.properties deleted file mode 100644 index 46226f164..000000000 --- a/config/log4j/log4j.properties +++ /dev/null @@ -1,67 +0,0 @@ -# level : 是日志记录的优先级,分为OFF、FATAL、ERROR、WARN、INFO、DEBUG、ALL或者您定义的级别。 -#Log4j建议只使用四个级别,优先级从高到低分别是ERROR、WARN、INFO、DEBUG。 -#Log4jTest.java中的Logger logger = Logger.getLogger(this.getClass().getName());可能对应了log4j.rootLogger=DEBUG,CONSOLE,A1的配置 -log4j.rootLogger=INFO,D,E,stdout - -##########控制台输出############## -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n - -#######配置hibernate日志输入目录,暂时没有使用到############ -#log4j.logger.org.hibernate = OFF,hibernate -#log4j.logger.org.hibernate.tool.hbm2ddl=debug -#log4j.appender.hibernate = org.apache.log4j.RollingFileAppender -#log4j.appender.hibernate.file = ${webApp.log4j.path}/logs/jsh_hibernate.log -#log4j.appender.hibernate.layout = org.apache.log4j.PatternLayout -#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n -#log4j.appender.hibernate.layout.conversionPattern = %-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n -#log4j.appender.hibernate.append = false - -###输出到日志文件指定最低为INFO级别 ### -log4j.appender.D=org.apache.log4j.RollingFileAppender -log4j.appender.D.File=${webApp.log4j.path}/logs/jsh-info.log -log4j.appender.D.MaxFileSize=50MB -log4j.appender.D.MaxBackupIndex=10 -##the lower level -log4j.appender.D.Threshold=INFO -log4j.appender.D.layout=org.apache.log4j.PatternLayout -#log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-[%C %M %L]:%m%n -log4j.appender.D.layout.ConversionPattern=%-d{yyyy-MM-dd HH:mm:ss} [%p]-%m%n - -###输出错误信息内容到指定文件ERROR级别### -log4j.appender.E= org.apache.log4j.RollingFileAppender -log4j.appender.E.File=${webApp.log4j.path}/logs/jsh-error.log -log4j.appender.E.MaxFileSize=50MB -log4j.appender.E.MaxBackupIndex=10 -log4j.appender.E.Threshold = ERROR -log4j.appender.E.layout = org.apache.log4j.PatternLayout -##log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-[%C %M %L]\:%m%n -log4j.appender.E.layout.ConversionPattern =%-d{yyyy-MM-dd HH\:mm\:ss} [%p]-%m%n -# %n代表换行 -# %d代表日期 -# %c代表路径名(Logger.getLogger("DAO")时为DAO:,Logger.getLogger(this.getClass().getName())时为绝对类名)# %c{1}为类名,如Log4jTest -# %l代表类路径及代码所在行数,%L仅代表代码所在行数 -# [%-5p]代表该日志对应的日志级别(%5p),如DEBUG,ERROR,中间的-起到在[]中左对齐的作用 -# %m代表“类名:”(Logger.getLogger("DAO")时为DAO:,Logger.getLogger(this.getClass().getName())时为类名)及日志信息 -#---------------------------------------------------------------------------------- -#分别说明如下: -#1、使用Logger logger = Logger.getLogger("DAO")获得配置时,属性文件中必须要有对应设置:log4j.logger.DAO=DEBUG,A2 -#2、%c为DAO -#3、%l为logger.debug("DAO: Debug info.");的类绝对路径以及代码所在行, -# log.DAOlogTest.doGet(DAOlogTest.java:23) -#4、%L为logger.debug("DAO: Debug info.");代码所在行 23 -#5、%m为类名和日志信息 DAO: Debug info. -#1、使用Logger logger = Logger.getLogger(this.getClass().getName())获得配置时 -#2、%c为log.Log4jTest %c{1}为Log4jTest -#3、%l为 log.Log4jTest.doGet(Log4jTest.java:23) -#4、%L同上 -#5、%m为 Debug info. -#-X号: X信息输出时左对齐; -#%p: 日志信息级别 -#%d{}: 日志信息产生时间 -#%c: 日志信息所在地(类名) -#%m: 产生的日志具体信息 -#%n: 输出日志信息换行 diff --git a/config/spring/basic-applicationContext.xml b/config/spring/basic-applicationContext.xml deleted file mode 100644 index 9d1e86fed..000000000 --- a/config/spring/basic-applicationContext.xml +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/spring/dao-applicationContext.xml b/config/spring/dao-applicationContext.xml deleted file mode 100644 index 8261312ce..000000000 --- a/config/spring/dao-applicationContext.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/spring/quartz-applicationContext.xml.xml b/config/spring/quartz-applicationContext.xml.xml deleted file mode 100644 index 444ff888f..000000000 --- a/config/spring/quartz-applicationContext.xml.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - 0 45 9,10,11,12 * * ? - - - - - - - - timerTest - - - - \ No newline at end of file diff --git a/config/struts2/account-struts.xml b/config/struts2/account-struts.xml deleted file mode 100644 index e96a081d7..000000000 --- a/config/struts2/account-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/config/struts2/accountHead-struts.xml b/config/struts2/accountHead-struts.xml deleted file mode 100644 index 927330b66..000000000 --- a/config/struts2/accountHead-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/config/struts2/accountItem-struts.xml b/config/struts2/accountItem-struts.xml deleted file mode 100644 index c470d14b0..000000000 --- a/config/struts2/accountItem-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/config/struts2/app-struts.xml b/config/struts2/app-struts.xml deleted file mode 100644 index e856de878..000000000 --- a/config/struts2/app-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/asset-struts.xml b/config/struts2/asset-struts.xml deleted file mode 100644 index 50c753474..000000000 --- a/config/struts2/asset-struts.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - application/vnd.ms-excel - excelStream - attachment;filename="${fileName}" - 1024 - - - - - - - application/vnd.ms-excel - excelStream - attachment;filename="${fileName}" - 1024 - - /pages/asset/asset.jsp - - - \ No newline at end of file diff --git a/config/struts2/assetname-struts.xml b/config/struts2/assetname-struts.xml deleted file mode 100644 index 5aeb1016a..000000000 --- a/config/struts2/assetname-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/category-struts.xml b/config/struts2/category-struts.xml deleted file mode 100644 index 3322bbba8..000000000 --- a/config/struts2/category-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/channel-struts.xml b/config/struts2/channel-struts.xml deleted file mode 100644 index 1b245309e..000000000 --- a/config/struts2/channel-struts.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/config/struts2/depot-struts.xml b/config/struts2/depot-struts.xml deleted file mode 100644 index c3c219b7b..000000000 --- a/config/struts2/depot-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/depotHead-struts.xml b/config/struts2/depotHead-struts.xml deleted file mode 100644 index e6f581fae..000000000 --- a/config/struts2/depotHead-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/depotItem-struts.xml b/config/struts2/depotItem-struts.xml deleted file mode 100644 index 2d1066135..000000000 --- a/config/struts2/depotItem-struts.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - application/vnd.ms-excel - excelStream - attachment;filename="${fileName}" - 1024 - - - - \ No newline at end of file diff --git a/config/struts2/functions-struts.xml b/config/struts2/functions-struts.xml deleted file mode 100644 index 5fb66ff64..000000000 --- a/config/struts2/functions-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/inOutItem-struts.xml b/config/struts2/inOutItem-struts.xml deleted file mode 100644 index 99d49db81..000000000 --- a/config/struts2/inOutItem-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/config/struts2/log-struts.xml b/config/struts2/log-struts.xml deleted file mode 100644 index 77fb29498..000000000 --- a/config/struts2/log-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/material-struts.xml b/config/struts2/material-struts.xml deleted file mode 100644 index d5e387787..000000000 --- a/config/struts2/material-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/materialCategory-struts.xml b/config/struts2/materialCategory-struts.xml deleted file mode 100644 index d682bdaaa..000000000 --- a/config/struts2/materialCategory-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/person-struts.xml b/config/struts2/person-struts.xml deleted file mode 100644 index 47fb0b161..000000000 --- a/config/struts2/person-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/report-struts.xml b/config/struts2/report-struts.xml deleted file mode 100644 index b34945fd2..000000000 --- a/config/struts2/report-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/role-struts.xml b/config/struts2/role-struts.xml deleted file mode 100644 index 09fb1c67c..000000000 --- a/config/struts2/role-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/struts.properties b/config/struts2/struts.properties deleted file mode 100644 index 8847c128a..000000000 --- a/config/struts2/struts.properties +++ /dev/null @@ -1,2 +0,0 @@ -# struts.properties -#struts.custom.i18n.resources=messages diff --git a/config/struts2/struts.xml b/config/struts2/struts.xml deleted file mode 100644 index 6f8de0785..000000000 --- a/config/struts2/struts.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /pages/common/admin.jsp - - - /pages/common/{1}.jsp - - - /pages/common/admin.jsp - - - \ No newline at end of file diff --git a/config/struts2/supplier-struts.xml b/config/struts2/supplier-struts.xml deleted file mode 100644 index 407b1b57a..000000000 --- a/config/struts2/supplier-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/config/struts2/user-struts.xml b/config/struts2/user-struts.xml deleted file mode 100644 index 02abc3916..000000000 --- a/config/struts2/user-struts.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - /logout.jsp - - - - \ No newline at end of file diff --git a/config/struts2/userBusiness-struts.xml b/config/struts2/userBusiness-struts.xml deleted file mode 100644 index 467130c4a..000000000 --- a/config/struts2/userBusiness-struts.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - \ No newline at end of file