forgon-ssts-v7.0

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 4
Last Commit: 25 Jan
Commits this week: 0
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 40026 is being indexed.

Monday 21 Apr
4:31 下午

zc.li

SSTS-751 设备接口迁移升级
Options
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/CaspDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHuaDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Getinge86SeriesDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeWD500DataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/MaTaDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImplForFJSSSYY.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisAMSCO3052DataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/FileOfDatReader.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/YouYuanDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/LowTemperatureManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/GetingeDataManagerImpl.java
    • ?
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java
  16. … 13 more files in changeset.
Tuesday 15 Apr
6:37 下午

terry.kwan

SSTS-749 ,修改xml文件中的xml命名空间定义，升级到新版本
Options
    • ?
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/spring/timer.xml
6:25 下午

zc.li

修复 jasper 报错新版本中ref标签不支持local的问题
Options
    • ?
    /localrepo/jasperreports/jasperreports-chart-themes/4.7.0/jasperreports-chart-themes-4.7.0.jar
6:16 下午

terry.kwan

SSTS-749 ,修改xml文件中的xml命名空间定义，升级到新版本
Options
    • ?
    /ssts-web/src/main/webapp/disinfectsystem/config/demo/spring/timer.xml
Monday 14 Apr
11:40 上午

zc.li

一处代码完善 不至于在编译器中报错
Options
    • ?
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
12:52 上午

terry.kwan

SSTS-749 ，解决解决通过外部Tomcat部署时包冲突的问题，做了如下修改：

1. 将MQSDKJAVA-1.0.1.jar中的org.codehaus.stax2包名修改为cha.org.codehaus.stax2,解决通过外部Tomcat部署时包冲突的问题

2. 调整多个包的日志级别

3. 调整项目的依赖jar包

Options
    • ?
    /ssts-web/build.gradle
    • ?
    /localrepo/com/ibm/mq/MQSDKJAVA/1.0.1/MQSDKJAVA-1.0.1.jar
    • ?
    /ssts-web/src/main/resources/logback-test.xml
    • ?
    /build.gradle
    • ?
    /ssts-web/src/main/java/com/forgon/disinfectsystem/SstsApplication.java
    • ?
    /ssts-web/src/main/webapp/META-INF/context.xml
    • ?
    /ssts-web/src/main/resources/logback.xml
    • ?
    /ssts-web/src/main/resources/spring/applicationContext-temp-beans.xml
    • ?
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /ssts-web/src/test/resources/logback-test.xml
    • ?
    /ssts-web/src/main/resources/application.properties
    • ?
    /forgon-tools/src/main/java/com/forgon/tools/util/PathUtils.java
Monday 07 Apr
12:40 上午

terry.kwan

SSTS-749 ，将SstsApplication应用修改为既支持WAR/Exploded部署，同时也支持gradle bootRun命令运行。
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/SstsApplication.java
Sunday 06 Apr
11:25 下午

terry.kwan

1. DWRUtil改为dwr.util

2. dwr.xml中的signatures的定义去掉，解决升级至dwr3.0.2版本后调用时出现NullPointer错误的问题

3. 将web.xml文件中的大部分servlet改为通过在WebConfig.java文件中进行配置

4. 解决其它运行时出现的问题

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/log/action/LogAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selContactGroup.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selPersonByOrgUnit.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/application.properties
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/filedownload/servlet/FileDownLoadServlet.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selPersonByExt.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selProduct.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selRoleByExt.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selPersonAndOrgByExt.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selCatalogue.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/security/action/ButtJointUserAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
  16. … 25 more files in changeset.
Wednesday 02 Apr
11:56 下午

terry.kwan

测试用例运行前初始化WebRootInitializer，给webROOT变量赋值
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
1:43 上午

terry.kwan

1. HibernateConfig.java文件改为读取application.properties的配置

2. SQLServer2012数据库方言指定为org.hibernate.dialect.SQLServer2012Dialect，解决视图列表分页查询报错的问题

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/application.properties
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/springboot/HibernateConfig.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/resources/application-test.properties
Tuesday 01 Apr
12:50 上午

terry.kwan

1. 增加MyBatis的支持

2. Spring Boot启动时，@ImportResource中可以通过${webROOT}占位符引用项目自己的spring bean定义文件

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/spring/webservice-cxf.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/application.properties
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/build.gradle
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/springboot/HibernateConfig.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/spring/applicationContext-demo.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/SstsApplication.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/springboot/MyBatisConfig.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/tousseinstance/service/TousseInstanceWebServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/userecord/service/UseRecordWebServiceImpl.java
Monday 31 Mar
8:46 上午

terry.kwan

增加WebRootInitializer类，将com.forgon.tools.Path.webROOT的值注册到Spring Environment中，使得在Spring Boot启动时，@ImportResource中可以通过${webROOT}占位符引用项目自己的spring bean定义文件。
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/springboot/WebRootInitializer.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/controller/ButtjointUserAndOrgAndPatientController.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/action/SatisfactionSurveyTemplateAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/SstsApplication.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/demo/spring/applicationContext-demo.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dwr/DataSynchronizationTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/service/DataSynchronizationManagerImpl.java
Sunday 30 Mar
8:36 下午

terry.kwan

1. 删除jdbc.properties文件，改为在application.properties文件中配置

2. 进行修改，让测试用例能够运行

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/springboot/HibernateConfig.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/TestComponentScanConfig.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/system/concurrent/service/test/OptimisticLockManagerTestLevel1Impl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/security/tools/CssdUtils2.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/disinfectsystem/synthetic/allrecycle/service/RunInfoLogManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JDBCConnection.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/directory/service/AdUserManagement.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext-temp-beans.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/settings/JdbcProperties.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/beanRefContextSimple.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/DataGenerater.java
  16. … 21 more files in changeset.
Wednesday 26 Mar
1:58 上午

terry.kwan

提交修改的文件
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/TousseDefinitionImportController.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/dwr/table/BorrowRecordTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/recall/action/RecallRecordAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-action.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/util/ExtGridUtils.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recallrecord/src/main/java/com/forgon/disinfectsystem/recall/service/RecallRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionImportController.java
Tuesday 25 Mar
6:38 下午

terry.kwan

提交修改的文件，做了如下几个修改：

1. 去掉了action请求URL地址中的.mhtml的后缀，因为后缀匹配功能在Spring的新版本中已被视为过时功能，长期来看建议调整客户端URL格式，直接使用不带后缀的路径；

2. 将一部分在xml文件中定义的spring bean改为java配置定义

3. 乐观锁机制改为通过java配置来实现

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/importExpensiveGoods.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/inputPrint.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/equipmentinspection/instance/service/EquipmentInspectionInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/systemmanage/userExtViewForDisable.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/action/ImportBasedataController.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseExclusiveDoctor/tousseExclusiveDoctorForm.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/homepage/systemMngMenu.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/bjscylyy/bjscylyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/gyey/PatientAdmissionInfoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/cszxyy/web-xml/web.xml
  16. … 287 more files in changeset.
Monday 17 Mar
1:59 上午

terry.kwan

提交修改的文件，主要是将spring bean，从xml配置改为了java配置。
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ChargeRecordItemManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentsettype/service/InstrumentSetTypeManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanUpdateManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JDBCConnection.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext-acegi-security.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanUpdateManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-packing/src/main/java/com/forgon/disinfectsystem/packaging/service/PackagingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/dataupdater/service/UpdateDataBetween2Version.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-knowledge/src/main/java/com/forgon/knowledge/service/TrainingRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/crypto/coder/CoderEncryption.java
  16. … 147 more files in changeset.
Friday 14 Mar
1:38 上午

terry.kwan

提交修改的文件，是将spring bean，从xml配置改为了java配置。
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext-oa-action.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/dwr/table/ProxyDisinfectionTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/workflow/dwr/table/WorkFlowTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/stocktakerecordmanager/service/StockTakeRecordManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/databaseadapter/service/SqlFunctionsAdapter.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/recall/dwr/table/RecallTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/dwr/table/FormDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/security/action/RoleAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/MaterialInvoiceTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/dwr/table/IDCardDefinitionTableManager.java
  16. … 52 more files in changeset.
Thursday 13 Mar
1:54 下午

terry.kwan

提交修改的文，主要是将spring bean，从xml配置，改为了java配置
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/dwr/table/ReportFormsCenterTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/dwr/table/CameraDefinitionTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/videomonitor/dwr/table/WorkstationTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsStockManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/dwr/table/QualityMonitoringInstanceTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GoodPurchaseTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importexpensivegoods/service/ImportExpensiveGoodsManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManager.java
  16. … 35 more files in changeset.
2:19 上午

terry.kwan

完成一部分文件的升级，主要是将spring bean，从xml配置，改为了java配置
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageLocationManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/urgent/service/UrgentLevelManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/systemsetting/service/HttpTreeOptionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/src/main/java/com/forgon/security/service/ResourceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/equipmentinspection/definition/dwr/table/EquipmentInspectionDefTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/TousseInstanceInfoManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/dwr/table/CleanMethodTableManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/cssdhandletousses/service/CssdHandleTousseManager.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/instrumentinstance/service/InstrumentInstanceManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/db/DataBaseBackupManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/dwr/WarehouseTableManager.java
  16. … 350 more files in changeset.
Friday 21 Feb
10:59 下午

terry.kwan

提交需要的本地的jar包
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/org.directwebremoting/dwr/2.0.5.JAVASCRIPT/dwr-2.0.5.JAVASCRIPT.jar
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/db2/jcc/db2jcc4/4.16.53/db2jcc4-4.16.53.pom
  3. /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/mq/hamcrest-core/1.1
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/com/intersys/cache-jdbc/2016.2/cache-jdbc-2016.2.jar
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/org/seleniumhq/selenium/selenium-server-standalone/3.9.1/selenium-server-standalone-3.9.1.jar
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/mq/connector/1.0/connector-1.0.jar
  7. /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/db2/jcc
  8. /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/mq/MQSDKJAVA/1.0.1
  9. /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/mq/MQSDK1.6/3.0.1
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/org/seleniumhq/selenium/selenium-server-standalone/3.141.59/selenium-server-standalone-3.141.59.jar
  11. /SterileSupplySystem/branches/V7.0.0/localrepo/io/qameta/allure
  12. /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/db2/jcc/db2jcc/3.66.46
  13. /SterileSupplySystem/branches/V7.0.0/localrepo/org/seleniumhq/selenium/selenium-server-standalone/3.3.1
    • ?
    /SterileSupplySystem/branches/V7.0.0/localrepo/com/ibm/mq/pcf/7.0.1.3/pcf-7.0.1.3.jar
  15. /SterileSupplySystem/branches/V7.0.0/localrepo/com/intersys/cache-jdbc/2016.2
  16. … 62 more files in changeset.
10:01 下午

terry.kwan

删除Eclipse项目的文件
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-default-impl/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-recyclingapplication/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-basedata/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-invoice/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-sterile/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-satisfactionsurvey/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-datasync-jysrmyy-impl/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-storagelocation/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-receiverecord/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-print/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-gdsy-misc/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-core/.classpath
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-cszxyy-misc/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-schedule/.project
  16. … 69 more files in changeset.
10:00 下午

terry.kwan

删除Eclipse项目的文件
Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/.project
    • ?
    /SterileSupplySystem/branches/V7.0.0/.classpath
5:56 下午

terry.kwan

删除多余的文件夹
Options
  1. /SterileSupplySystem/branches/V7.0.0/forgon-ssts
Wednesday 19 Feb
8:34 上午

terry.kwan

项目整体升级为spring boot。子项目ssts-web项目升级至Spring Boot 2.7.18版本，其它的子项目都是工具类的子项目，产生jar包供ssts-web项目调用，ssts-web子项目的JAVA后端是基于spring framework 5.3.30版本，spring security 5.7.14版本，dwr 3.0.2-RELEASE版本，hibernate 5.6.15.Final版本。spring security的配置是在applicationContext-acegi-security.xml文件中进行配置的。

TODO：

1. 在xml文件中定义的spring beans要修改为Java配置

2. 需要让junit单元测试运行起来，验证整体升级完成后功能是否正常，以及增强后继修改代码的信心

Options
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/runwithtrans/service/RunWithTransNewManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ExportBasedataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/resources/spring/demo/interfaces/dataSyncConfig.json
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/equipmentInspection/forminstanceView.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/goodsapplicationcffirm/goodsApplicationCffirmView.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/common/selRoleByExt.jsp
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/printformtemplate/model/FormPrintTemplate.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/js/selectlink3.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/xgqjsqfwzx/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/mmsrmyy/menu/menuconfigure.js
    • ?
    /SterileSupplySystem/branches/V7.0.0/ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/menu/menuconfigure.js
  16. … 736 more files in changeset.
Saturday 25 Jan
1:33 上午

terry.kwan

创建升级到Spring Boot的版本，从4.1.0的最新版进行升级
Options
  1. /
  2. /SterileSupplySystem/branches/V7.0.0
    • too large
    /ssts-web/src/main/webapp/forgon4/ext-4.2.5/resources/ext-theme-classic/ext-theme-classic-all.css
    • ?
    /ssts-web/src/main/webapp/ext-3.4.0/resources/images/default/qtip/tip-sprite.gif
    • ?
    /forgon-core/src/main/java/com/forgon/disinfectsystem/version/VersionAble.java
    • ?
    /ssts-web/src/main/webapp/ext-3.4.0/docs/resources/images/default/grid/row-sel.gif
    • ?
    /ssts-web/src/main/webapp/bootstrap-x-editable-develop/src/inputs/dateui/jquery-ui-datepicker/css/redmond/images/ui-icons_f9bd01_256x240.png
  8. /ssts-web/src/main/webapp/ext-3.4.0/resources/images/yourtheme/dd
    • ?
    /ssts-web/src/main/webapp/forgon4/css/icons/icon-paste24.png
    • ?
    /ssts-web/src/main/webapp/images/image06.gif
    • ?
    /ssts-web/src/main/webapp/ext-3.4.0/resources/css/theme-access/toolbar.css
    • ?
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/zsyy/Response.java
    • ?
    /ssts-web/src/main/webapp/dx-disinfectsystem/plugins/ie-6/ddouble-bsie-fe3a04a/bootstrap/less/pager.less
    • ?
    /ssts-web/src/main/webapp/ext-4.1.0/resources/themes/images/gray/button/btn.gif
    • ?
    /ssts-web/src/main/webapp/ext-4.1.0/resources/themes/images/default/form/exclamation.gif
  16. … 28104 more files in changeset.