Index: forgon-tools/src/main/java/com/forgon/tools/util/ConfigUtils.java =================================================================== diff -u -r40619 -r41055 --- forgon-tools/src/main/java/com/forgon/tools/util/ConfigUtils.java (.../ConfigUtils.java) (revision 40619) +++ forgon-tools/src/main/java/com/forgon/tools/util/ConfigUtils.java (.../ConfigUtils.java) (revision 41055) @@ -5,25 +5,19 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Properties; import java.util.Scanner; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; @@ -35,15 +29,30 @@ import com.forgon.tools.Path; import com.forgon.tools.string.StringTools; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + /** * @author dandan 2018年7月26日 下午2:35:30 * */ public class ConfigUtils { private static Logger logger = Logger.getLogger(ConfigUtils.class); private static Properties prop = null; + /** + * jdbc.properties属性文件的名称。 + * 在junit单元测试或者selenium单元测试中，可以设置为相应的名称 + * 例如jdbc-junit-test.properties或者jdbc-selenium-test.properties + * + */ + public static final String propFileName = "jdbc.properties"; + public static final String CLASSPATH = "classpath:"; + public static final String JDBC_TEST_PROPS = CLASSPATH + propFileName; // 编译期常量拼接 + + + /** * 获取config.js内容 * 支持config.js中有中文注释 @@ -511,7 +520,7 @@ * @return */ public static String getConfigProperty(String propertyName){ - String propFileName = "jdbc.properties"; + InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(propFileName); Index: ssts-web/src/main/webapp/WEB-INF/spring/applicationContext.xml =================================================================== diff -u -r39743 -r41055 --- ssts-web/src/main/webapp/WEB-INF/spring/applicationContext.xml (.../applicationContext.xml) (revision 39743) +++ ssts-web/src/main/webapp/WEB-INF/spring/applicationContext.xml (.../applicationContext.xml) (revision 41055) @@ -30,7 +30,7 @@ - classpath:jdbc.properties + #{'classpath:' + T(com.forgon.tools.util.ConfigUtils).propFileName} classpath:ldap.properties Index: ssts-web/src/main/resources/jdbc-junit-test.properties =================================================================== diff -u --- ssts-web/src/main/resources/jdbc-junit-test.properties (revision 0) +++ ssts-web/src/main/resources/jdbc-junit-test.properties (revision 41055) @@ -0,0 +1,231 @@ +# Targeted at system administrators, to avoid touching the context XML files. + +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +#project=zsxlrmyy +#project=autotest +#project=dgsetyy +#project=hzszxrmyy +#project=szsdsrmyy +#project=gdsfybjy +#project=hnsetyy +#project=gdsy +#project=gzzyyfs +#project=dgfy +#project=fsfy +#project=gmqrmyy +#project=bjdwljzqjyy +#project=hzszxrmyy +#project=cdlqyq1yy +#project=gyey +#project=gzzyyfs +#project=zd5y +#project=sznsfy +#project=dgjszx +#project=gd2zyy +#project=nfykdxfsdsyy +#project=gxzyyf1 +#project=zsykzx +#project=szslgzxyy +#project=cszxyy +#project=gdskqyy +#project=autotest +#project=zsly +#project=gzfdzl +#project=gzs12rmyy +#project=zsszyy +#project=zjyy +#project=bjscylyy +#project=zd5y +#project=hbstsgryy +#project=xmdxfsxayy +#project=gzspyqzyy +#project=dgsdhyy +#project=dgszyy +#project=gzfdzl +#project=jmrmyy +#project=dysyy +#project=zsyy +#project=nfykdxnfyy +#project=bj309yy +#project=szsdsrmyy +#project=qysrmyy +#project=qhrsgzzyy +#project=hdqrmyy +#project=ljsrmyy +project=demo +#project=wechat +#project=qifuyy +#project=dgsdbzxyy +#project=gzszyy +#project=xjjqzyy +#project=gzsdbrmyy +#project=gzslwqgskyy +#project=fjsssyy +#project=klmysrmyy +#project=fssdermyy +#project=gysdermyym +#project=zsdxfsdeyy +#project=szszyy +#project=ksdqdyrmyy +#project=zjjsrmyy + +database=sqlserver +hibernate.dialect=org.hibernate.dialect.SQLServerDialect +jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver +jdbc.username=c2E= +jdbc.password=cDJzc3dvcmQ= +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zsdxfsdyyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zsdxfsdeyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zsszyySterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=cdlqyq1yy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=hzszxrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zjyysterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=bjdwljzqjyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=dgsfySterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zdwy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=qysrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=gyeySterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=JYYYSterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=klmysrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=szslgzxyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=gzsdbrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=fssdermyy +jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=test +#jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=gdskqyySterile +#jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=AutoTest +#jdbc.url=jdbc:sqlserver://localhost:1433;databaseName=gzfdzlSterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=\u3011JFJZYYDBYXZX +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=szsdsrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=hbstsgryy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=xmdxfsxayy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=hdqrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zxyySterile +#szszlyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=xjjqzyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=hnsetyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=szszyySterile +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=hzszxrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zsdxfsdyyy +#jdbc.url=jdbc:sqlserver://192.168.2.110:1433;databaseName=autotest +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=cylyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=szsdsrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=ksdqdyrmyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=gdsy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=nfykdxfsdsyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=nfykdxnfyy +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=dgsdbzxyy20241224 +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=gzfdzlSterile20250118 +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=dgzyytmzs +#jdbc.url=jdbc:sqlserver://192.168.2.20:1433;databaseName=zsdxfsdeyy +#jdbc.url=jdbc:sqlserver://192.168.2.19:1433;databaseName=unittest +###user name: unittest, password: p2ssword +# + +##Rm9yZ29uMTIzNA== + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##fsfycc +#jdbc.username=ZnNmeWNj +#jdbc.password=ZnNmeWNj + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##ljsrmyy +#jdbc.username=bGpzcm15eQ== +#jdbc.password=bGpzcm15eQ== + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##pyqzyy +#jdbc.username=cHlxenl5 +#jdbc.password=cHlxenl5 + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##zyyfs +#jdbc.username=enl5ZnM= +#jdbc.password=enl5ZnM= + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##zsykzx +#jdbc.username=enN5a3p4 +#jdbc.password=enN5a3p4 + +#Oralce +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##gmqrmyy +#jdbc.username=Z21xcm15eQ== +#jdbc.password=Z21xcm15eQ== + + + +#Oracle +#database=oracle +#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +#jdbc.driverClassName=oracle.jdbc.OracleDriver +#jdbc.url=jdbc:oracle:thin:@//192.168.2.20:1521/ORCL +##dgsetyy +#jdbc.username=ZGdzZGJybXl5 +#jdbc.password=ZGdzZGJybXl5 + +#MySQL(root/p2ssword) +##tidb(root/p2ssword) +#database=tidb +#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#jdbc.driverClassName=com.mysql.jdbc.Driver +#jdbc.url=jdbc:mysql://192.168.2.231:4000/test +##gzszyy +##jdbc.url=jdbc:mysql://home.forgon.com:9398/test +#jdbc.username=cm9vdA== +#jdbc.password=cDJzc3dvcmQ= + + +#MySQL(root/p2ssword) +##tidb(root/GdsfybjyP2ssword) +#database=tidb +#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#jdbc.driverClassName=com.mysql.jdbc.Driver +#jdbc.url=jdbc:mysql://192.168.2.226:4000/gdsfybjySterile +##gdsfybjy +#jdbc.username=cm9vdA== +#jdbc.password=R2RzZnlianlQMnNzd29yZA== + +#MySQL +#database=mysql +#hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +#jdbc.driverClassName=com.mysql.jdbc.Driver +#jdbc.url=jdbc:mysql://dingxiangsoft.com:3306 +#jdbc.username=cm9vdA== +#jdbc.password=cDJzc3dvcmQ= + +#Production System PATH ---only for zsly +path.hibernate.dialect=org.hibernate.dialect.SQLServerDialect +path.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver +path.url=jdbc:sqlserver://192.168.17.22:1433;databaseName=HERP_PATH +#sm c20= +path.username=c20= +#sm@123 c21AMTIz +path.password=c21AMTIz +globalVersion = 4.1.533 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r41054 -r41055 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 41054) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 41055) @@ -1,5 +1,7 @@ package test.forgon.disinfectsystem; +import static com.forgon.tools.util.ConfigUtils.JDBC_TEST_PROPS; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -137,7 +139,7 @@ */ @WebAppConfiguration @ContextConfiguration(locations={"classpath:beanRefContext-test.xml"}) -@TestPropertySource("classpath:jdbc.properties") +@TestPropertySource(JDBC_TEST_PROPS) //@TransactionConfiguration(transactionManager="transactionManager", defaultRollback = true) //@DirtiesContext(classMode = ClassMode.AFTER_CLASS) //@TestExecutionListeners({DirtiesContextTestExecutionListener.class})