BMP
/
IntegralManager
mirror of https://gitee.com/bmpandlcm/IntegralManager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: BMP:60317b725d7d3b139dd807bfcfee5213a6c229aa
Branches Tags
BMP:master
...
compare: BMP:cd4dd07136a425fa9e7fb577e40d163d6fb4f5d0
Branches Tags
BMP:master

2 Commits
60317b725d ... cd4dd07136

Author SHA1 Message Date
白美平 cd4dd07136 数据同步功能修改 3 months ago
白美平 d0ce5007de 数据同步功能修改 3 months ago
36 changed files with 493 additions and 467 deletions
Show Stats

183
.idea/workspace.xml
Unescape Escape View File

@ -10,29 +10,41 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="修改积分核销失败的问题">
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/SolveIntegralController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/CopilotChatHistory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/CopilotChatHistory.xml" afterDir="false" />
<list default="true" id="29bcb86b-1634-41e0-a498-79481163cba8" name="Changes" comment="数据同步">
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/AtomikosConfig.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcBak.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DBSrcPetrol.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/common/GlobalExceptionHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/common/GlobalExceptionHandler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/IntegralManagerApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/IntegralManagerApplication.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DataSourceConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/DataSourceConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/config/MybatisConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/config/MybatisConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/controller/UserVehicleController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/UserTableMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/UserTableMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/UserTableMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapperset/oraclemapper/UserTableMapper.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/UserTableService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/UserTableService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/CommonServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/CommonServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralAppServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralAppServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralStarSetupServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegralStarSetupServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/OperatorsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/OperatorsServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/RotationServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SelectDataImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SelectDataImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/util/PubTools.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/VehicleScoreServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/VehicleScoreServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/logback-spring.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/application.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@ -51,12 +63,14 @@
</component>
<component name="FormatOnSaveOptions">
<option name="myFormatOnlyChangedLines" value="true" />
<option name="myRunOnSave" value="true" />
</component>
<component name="Git.Settings">
<option name="PUSH_AUTO_UPDATE" value="true" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GoLibraries">
<option name="indexEntireGoPath" value="true" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java" root0="SKIP_INSPECTION" />
</component>
@ -96,71 +110,75 @@
<component name="ProjectViewState">
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;Application.DivPassDataImpl.executor&quot;: &quot;Run&quot;,
&quot;Application.ImageUtils.executor&quot;: &quot;Run&quot;,
&quot;Application.OcrUtil.executor&quot;: &quot;Debug&quot;,
&quot;Application.PubTools.executor&quot;: &quot;Run&quot;,
&quot;Application.QCodeInfoServiceImpl.executor&quot;: &quot;Debug&quot;,
&quot;Application.SensitiveFilter.executor&quot;: &quot;Run&quot;,
&quot;Application.main.executor&quot;: &quot;Run&quot;,
&quot;Application.redisConfigUtil.executor&quot;: &quot;Debug&quot;,
&quot;Maven.IntegraManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegraManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [site].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManager [validate].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.IntegralManagerSys [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.devProject [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.dev_project [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [clean].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [install].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [package].executor&quot;: &quot;Run&quot;,
&quot;Maven.special_event [validate].executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
&quot;TomEE Server.special_event.executor&quot;: &quot;Debug&quot;,
&quot;Tomcat Server.Tomcat 9.0.80.executor&quot;: &quot;Debug&quot;,
&quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/workspace/IntegralManager&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;project.structure.last.edited&quot;: &quot;Artifacts&quot;,
&quot;project.structure.proportion&quot;: &quot;0.15&quot;,
&quot;project.structure.side.proportion&quot;: &quot;0.37169158&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.project.maven.importing&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
"Application.DivPassDataImpl.executor": "Run",
"Application.ImageUtils.executor": "Run",
"Application.OcrUtil.executor": "Debug",
"Application.PubTools.executor": "Run",
"Application.QCodeInfoServiceImpl.executor": "Debug",
"Application.SensitiveFilter.executor": "Run",
"Application.main.executor": "Run",
"Application.redisConfigUtil.executor": "Debug",
"Maven.IntegraManager [clean].executor": "Run",
"Maven.IntegraManager [install].executor": "Run",
"Maven.IntegralManager [clean].executor": "Run",
"Maven.IntegralManager [install].executor": "Run",
"Maven.IntegralManager [site].executor": "Run",
"Maven.IntegralManager [validate].executor": "Run",
"Maven.IntegralManager [verify].executor": "Run",
"Maven.IntegralManagerSys [clean].executor": "Run",
"Maven.IntegralManagerSys [install].executor": "Run",
"Maven.devProject [clean].executor": "Run",
"Maven.devProject [install].executor": "Run",
"Maven.dev_project [clean].executor": "Run",
"Maven.dev_project [install].executor": "Run",
"Maven.special_event [clean].executor": "Run",
"Maven.special_event [install].executor": "Run",
"Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
"Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
"Maven.special_event [package].executor": "Run",
"Maven.special_event [validate].executor": "Run",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.go.formatter.settings.were.checked": "true",
"RunOnceActivity.go.migrated.go.modules.settings": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"TomEE Server.special_event.executor": "Debug",
"Tomcat Server.Tomcat 9.0.80.executor": "Debug",
"deletionFromPopupRequiresConfirmation": "false",
"git-widget-placeholder": "master",
"go.import.settings.migrated": "true",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "D:/workspace/DivDataProject",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"project.structure.last.edited": "Artifacts",
"project.structure.proportion": "0.15",
"project.structure.side.proportion": "0.37169158",
"settings.editor.selected.configurable": "reference.settings.project.maven.importing",
"vue.rearranger.settings.migration": "true"
},
&quot;keyToStringList&quot;: {
&quot;DatabaseDriversLRU&quot;: [
&quot;oracle&quot;
"keyToStringList": {
"DatabaseDriversLRU": [
"oracle"
]
}
}</component>
}]]></component>
<component name="ReactorSettings">
<option name="notificationShown" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\workspace\IntegralManager\src\main\java\com\nmgs\mapperset\mysqlmapper" />
<recent name="D:\workspace\IntegralManager\src\main\java\com\nmgs\config" />
<recent name="D:\workspace\IntegralManager\src\main\java\com\nmgs\mapperset\oraclemapper" />
<recent name="D:\workspace\IntegralManager\src\main\java\com\nmgs\mapperset\mysqlmapper" />
<recent name="D:\workspacebak\IntegralManager\src\main\java\com\nmgs\mapperset\mysqlmapper" />
<recent name="D:\workspacebak\IntegralManager\src\main\java\com\nmgs\mapperset\oraclemapper" />
<recent name="D:\workspacebak\IntegralManager\src\main\java\com\nmgs\mapper\oraclemapper" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\work\TGGLT-WorkSpace\dev_project\src\main\java\com\nmgs\mapper" />
@ -649,7 +667,9 @@
<workItem from="1755564954257" duration="16711000" />
<workItem from="1755760863043" duration="5702000" />
<workItem from="1755767987191" duration="488000" />
<workItem from="1756173838376" duration="2903000" />
<workItem from="1756173838376" duration="4099000" />
<workItem from="1756363038283" duration="33354000" />
<workItem from="1756685986672" duration="20841000" />
</task>
<task id="LOCAL-00001" summary="特请处理">
<option name="closed" value="true" />
@ -891,7 +911,15 @@
<option name="project" value="LOCAL" />
<updated>1753759290530</updated>
</task>
<option name="localTasksCounter" value="31" />
<task id="LOCAL-00031" summary="数据同步">
<option name="closed" value="true" />
<created>1756191074573</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1756191074573</updated>
</task>
<option name="localTasksCounter" value="32" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -930,7 +958,12 @@
<MESSAGE value="连接两个数据库进行同步数据，并且保持事务一致性" />
<MESSAGE value="修改积分核销不显示核销的积分数" />
<MESSAGE value="修改积分核销失败的问题" />
<option name="LAST_COMMIT_MESSAGE" value="修改积分核销失败的问题" />
<MESSAGE value="数据同步" />
<option name="LAST_COMMIT_MESSAGE" value="数据同步" />
</component>
<component name="VgoProject">
<integration-enabled>false</integration-enabled>
<settings-migrated>true</settings-migrated>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>

3
pom.xml
Unescape Escape View File

@ -266,13 +266,14 @@
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>*.properties</exclude>
<!--<exclude>*.properties</exclude>-->
<!-- <exclude>static/**</exclude>
<exclude>excel/**</exclude>
<exclude>META-INF/spring.factories</exclude>-->
</excludes>
<includes>
<include>logback-spring.xml</include>
<include>jta.properties</include>
<include>static/**</include>
<include>excel/**</include>
<include>META-INF/spring.factories</include>

2
src/main/java/com/nmgs/IntegralManagerApplication.java
Unescape Escape View File

@ -5,9 +5,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableAsync
@SpringBootApplication
@EnableTransactionManagement
public class IntegralManagerApplication extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {

119
src/main/java/com/nmgs/MyEnvironmentPostProcessor.java
Unescape Escape View File

@ -42,76 +42,67 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType");
Newproperties.load(Files.newInputStream(Paths.get(NewPath)));
properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs");
properties.setProperty("spring.datasource.primary.jdbc-url", properties.getProperty("DBUrl"));
properties.setProperty("spring.datasource.primary.username", properties.getProperty("DBUserName"));
properties.setProperty("spring.datasource.primary.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
properties.setProperty("spring.datasource.main.jdbc-url", properties.getProperty("DBUrl"));
properties.setProperty("spring.datasource.main.username", properties.getProperty("DBUserName"));
properties.setProperty("spring.datasource.main.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl"));
properties.setProperty("spring.datasource.username",properties.getProperty("DBUserName"));
System.out.println(properties.getProperty("DBPassWord"));
System.out.println(PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
System.out.println(properties.getProperty("DBPassWord").toCharArray().length);
properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
String BakDBType = properties.getProperty("BakDBType") == null ? "1" : properties.getProperty("BakDBType");
properties.setProperty("spring.datasource.db-petrol.jdbc-url",properties.getProperty("DBUrl"));
properties.setProperty("spring.datasource.db-petrol.username",properties.getProperty("DBUserName"));
properties.setProperty("spring.datasource.db-petrol.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
properties.setProperty("spring.datasource.db-bak.jdbc-url",properties.getProperty("BAKDBUrl"));
properties.setProperty("spring.datasource.db-bak.username",properties.getProperty("BAKDBUserName"));
properties.setProperty("spring.datasource.db-bak.password",PassWordUtils.decrypt(properties.getProperty("BAKDBPassWord")));
if(DBType.equals("1")){
properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.db-petrol.driver-class-name",Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("sqlvalidationQuery"));
}else if(DBType.equals("2")){
properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("OracleClassName"));
properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("OracleClassName"));
properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.db-petrol.driver-class-name",Newproperties.getProperty("OracleClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("OraclevalidationQuery"));
}else if(DBType.equals("3")){
properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("DMClassName"));
properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("DMClassName"));
properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.db-petrol.driver-class-name",Newproperties.getProperty("DMClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("DMvalidationQuery"));
}else if(DBType.equals("4")){
properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.db-petrol.driver-class-name",Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("MySQLvalidationQuery"));
}
String BakDBType = properties.getProperty("BakDBType") == null ? "1" : properties.getProperty("BakDBType");
properties.setProperty("spring.datasource.bak.jdbc-url", properties.getProperty("BAKDBUrl"));
properties.setProperty("spring.datasource.bak.username", properties.getProperty("BAKDBUserName"));
properties.setProperty("spring.datasource.bak.password", PassWordUtils.decrypt(properties.getProperty("BAKDBPassWord")));
if (BakDBType.equals("1")) {
properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
} else if (BakDBType.equals("2")) {
properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("OracleClassName"));
properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
} else if (BakDBType.equals("3")) {
properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("DMClassName"));
properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
} else if (BakDBType.equals("4")) {
properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
if(BakDBType.equals("1")){
properties.setProperty("spring.datasource.db-bak.driver-class-name",Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("sqlClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("sqlvalidationQuery"));
}else if(BakDBType.equals("2")){
properties.setProperty("spring.datasource.db-bak.driver-class-name",Newproperties.getProperty("OracleClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("OraclevalidationQuery"));
}else if(BakDBType.equals("3")){
properties.setProperty("spring.datasource.db-bak.driver-class-name",Newproperties.getProperty("DMClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("DMvalidationQuery"));
}else if(BakDBType.equals("4")){
properties.setProperty("spring.datasource.db-bak.driver-class-name",Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("MySQLvalidationQuery"));
}
System.out.println("---------------------------IntegralManager本次载入数据库----------------------");
System.out.println(" url : " + properties.getProperty("spring.datasource.primary.jdbc-url"));
System.out.println(" username : " + properties.getProperty("spring.datasource.primary.username"));
System.out.println(" password : " + properties.getProperty("spring.datasource.primary.password"));
System.out.println(" driver-class-name : " + properties.getProperty("spring.datasource.primary.driver-class-name"));
System.out.println(" bakurl : " + properties.getProperty("spring.datasource.bak.jdbc-url"));
System.out.println(" bakusername : " + properties.getProperty("spring.datasource.bak.username"));
System.out.println(" bakpassword : " + properties.getProperty("spring.datasource.bak.password"));
System.out.println(" bakdriver-class-name : " + properties.getProperty("spring.datasource.bak.driver-class-name"));
System.out.println(" mainurl : " + properties.getProperty("spring.datasource.main.jdbc-url"));
System.out.println(" mainusername : " + properties.getProperty("spring.datasource.main.username"));
System.out.println(" mainpassword : " + properties.getProperty("spring.datasource.main.password"));
System.out.println(" maindriver-class-name : " + properties.getProperty("spring.datasource.main.driver-class-name"));
System.out.println("---------------------------IntegralManager本次载入数据库----------------------");
System.out.println("---------------------------PetrolCafeteriaFee本次载入数据库----------------------");
System.out.println("server.port: " + properties.getProperty("server.port"));
System.out.println(" url : " + properties.getProperty("spring.datasource.url"));
System.out.println(" username : " + properties.getProperty("spring.datasource.username"));
System.out.println(" DBPassWord : " + properties.getProperty("spring.datasource.password"));
System.out.println(" TimeZone : " + java.util.TimeZone.getDefault());
//环境名称随意取，但尽量不能和其他环境名称相同，避免不生效
PropertiesPropertySource propertySource = new PropertiesPropertySource("environmentPostProcessor", properties);
PropertiesPropertySource newPropertySource = new PropertiesPropertySource("newEnvironmentPostProcessor", Newproperties);

43
src/main/java/com/nmgs/config/AtomikosConfig.java
Unescape Escape View File

@ -0,0 +1,43 @@
package com.nmgs.config;
import com.atomikos.icatch.jta.UserTransactionImp;
import com.atomikos.icatch.jta.UserTransactionManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.jta.JtaTransactionManager;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
/**
* JTA 事务配置
*/
@Configuration
public class AtomikosConfig {
@Bean(name = "userTransaction")
public UserTransaction userTransaction() throws Throwable {
UserTransactionImp userTransactionImp = new UserTransactionImp();
userTransactionImp.setTransactionTimeout(600000);
return userTransactionImp;
}
@Bean(name = "atomikosTransactionManager")
public TransactionManager atomikosTransactionManager() throws Throwable {
UserTransactionManager userTransactionManager = new UserTransactionManager();
userTransactionManager.setForceShutdown(false);
userTransactionManager.setTransactionTimeout(600000);
return userTransactionManager;
}
@Bean(name = "transactionManager")
@DependsOn({ "userTransaction", "atomikosTransactionManager" })
public PlatformTransactionManager transactionManager() throws Throwable {
UserTransaction userTransaction = userTransaction();
TransactionManager atomikosTransactionManager = atomikosTransactionManager();
atomikosTransactionManager.setTransactionTimeout(600000);
return new JtaTransactionManager(userTransaction, atomikosTransactionManager);
}
}

45
src/main/java/com/nmgs/config/DBSrcBak.java
Unescape Escape View File

@ -0,0 +1,45 @@
package com.nmgs.config;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.nmgs.util.PropertiesUtil;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import javax.sql.DataSource;
@Configuration
@MapperScan(basePackages = {"com.nmgs.mapperset.mysqlmapper"}, sqlSessionFactoryRef = "sqlSessionFactoryBak")
public class DBSrcBak {
@Autowired
MybatisPlusInterceptor mybatisPlusInterceptor;
@Bean
public SqlSessionFactory sqlSessionFactoryBak(@Qualifier("db_bak") DataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
sqlSessionFactory.setDataSource(dataSource);
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
sqlSessionFactory.setConfiguration(configuration);
// sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
// .getResources("classpath:mapper/check/**/*.xml"));
return sqlSessionFactory.getObject();
}
@Bean
public SqlSessionTemplate sqlSessionTemplateBak(@Qualifier("sqlSessionFactoryBak") SqlSessionFactory sqlSessionFactory) throws Exception {
return new SqlSessionTemplate(sqlSessionFactory);
}
}

53
src/main/java/com/nmgs/config/DBSrcPetrol.java
Unescape Escape View File

@ -0,0 +1,53 @@
package com.nmgs.config;
import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import com.nmgs.util.PropertiesUtil;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
@Configuration
@MapperScan(basePackages = {"com.nmgs.mapperset.oraclemapper"}, sqlSessionFactoryRef = "sqlSessionFactoryPetrol")
public class DBSrcPetrol {
@Autowired
MybatisPlusInterceptor mybatisPlusInterceptor;
@Bean
@Primary
public SqlSessionFactory sqlSessionFactoryPetrol(@Qualifier("db_petrol") DataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean sqlSessionFactory = new MybatisSqlSessionFactoryBean();
sqlSessionFactory.setDataSource(dataSource);
// 添加分页插件
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
sqlSessionFactory.setConfiguration(configuration);
// sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
// .getResources("classpath:mapper/petrol/**/*.xml"));
return sqlSessionFactory.getObject();
}
@Bean
@Primary
public SqlSessionTemplate sqlSessionTemplatePetrol(@Qualifier("sqlSessionFactoryPetrol") SqlSessionFactory sqlSessionFactory) throws Exception {
return new SqlSessionTemplate(sqlSessionFactory);
}
}

232
src/main/java/com/nmgs/config/DataSourceConfig.java
Unescape Escape View File

@ -1,178 +1,116 @@
package com.nmgs.config;
import com.atomikos.icatch.jta.UserTransactionImp;
import com.atomikos.icatch.jta.UserTransactionManager;
import com.atomikos.jdbc.AtomikosDataSourceBean;
import com.mysql.cj.jdbc.MysqlXADataSource;
import com.nmgs.util.PropertiesUtil;
import com.trkf.PasswordEncryption.PassWordUtils;
import com.zaxxer.hikari.HikariDataSource;
import com.zaxxer.hikari.HikariConfig;
import oracle.jdbc.xa.client.OracleXADataSource;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.transaction.jta.JtaTransactionManager;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
import javax.sql.XADataSource;
import javax.transaction.SystemException;
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;
import java.sql.SQLException;
import java.util.Properties;
@Configuration
@EnableTransactionManagement
public class DataSourceConfig {
@Bean
public UserTransaction localuserTransaction() throws SystemException {
UserTransactionImp userTransactionImp = new UserTransactionImp();
userTransactionImp.setTransactionTimeout(600);
return userTransactionImp;
@ConfigurationProperties(prefix = "spring.datasource.hikari")
public HikariConfig hikariConfig(){
return new HikariConfig();
}
@Bean
public TransactionManager localtransactionManager() throws SystemException {
UserTransactionManager userTransactionManager = new UserTransactionManager();
userTransactionManager.setForceShutdown(false);
userTransactionManager.setTransactionTimeout(600);
return userTransactionManager;
}
@Bean
public JtaTransactionManager jtatransactionManager(
UserTransaction localuserTransaction,
TransactionManager localtransactionManager) {
JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(localuserTransaction, localtransactionManager);
jtaTransactionManager.setDefaultTimeout(600);
return jtaTransactionManager;
}
/**
* 将这个对象放入spring容器中（交给Spring管理）
* @ConfigurationProperties 自动配置属性
*/
@Bean
@ConfigurationProperties(prefix = "spring.datasource.primary")
public XADataSource getDataSourcePrimary() throws SQLException {
// 创建XA连接池
if("2".equals(PropertiesUtil.getValue("DBType"))){
@Primary
@Bean(name = "db_petrol")
@ConfigurationProperties(prefix = "spring.datasource.db-petrol")
@DependsOn("transactionManager")
public DataSource dBSrcPetrol() throws SQLException {
AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
//HikariDataSource hikariDataSource = new HikariDataSource();
String DBType = PropertiesUtil.getValue("DBType");
if(DBType.equals("2")){
OracleXADataSource oracleXADataSource = new OracleXADataSource();
oracleXADataSource.setURL(PropertiesUtil.getValue("DBUrl"));
oracleXADataSource.setUser(PropertiesUtil.getValue("DBUserName"));
oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("DBPassWord")));
return oracleXADataSource;
}else if("4".equals(PropertiesUtil.getValue("DBType"))){
MysqlXADataSource oracleXADataSource = new MysqlXADataSource();
oracleXADataSource.setURL(PropertiesUtil.getValue("DBUrl"));
oracleXADataSource.setUser(PropertiesUtil.getValue("DBUserName"));
oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("DBPassWord")));
return oracleXADataSource;
atomikosDataSourceBean.setXaDataSource(oracleXADataSource);
Properties properties = new Properties();
// properties.setProperty("v$session.osuser","GSY");
properties.setProperty("v$session.program","IntegralManager");
// 或者使用 Oracle 连接属性
properties.setProperty("oracle.jdbc.programName", "IntegralManager");
properties.setProperty("oracle.jdbc.moduleName", "IntegralManager");
properties.setProperty("oracle.jdbc.actionName", "IntegralManager");
properties.setProperty("applicationName", "IntegralManagerG");
atomikosDataSourceBean.setXaProperties(properties);
//hikariDataSource.setDataSource(oracleXADataSource);
}else if(DBType.equals("4")){
MysqlXADataSource mysqlXADataSource = new MysqlXADataSource();
mysqlXADataSource.setURL(PropertiesUtil.getValue("DBUrl"));
mysqlXADataSource.setUser(PropertiesUtil.getValue("DBUserName"));
mysqlXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("DBPassWord")));
//mysqlXADataSource.setPinGlobalTxToPhysicalConnection(true);
atomikosDataSourceBean.setXaDataSource(mysqlXADataSource);
//hikariDataSource.setDataSource(mysqlXADataSource);
}
return null;
}
@Bean(name = "primaryDataSource")
@DependsOn({"getDataSourcePrimary","jtatransactionManager"})
public DataSource primaryDataSource(@Qualifier("getDataSourcePrimary") XADataSource xaDataSource) {
AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
//atomikosDataSourceBean.setXaDataSourceClassName("com.zaxxer.hikari.HikariXADataSource");
// 必须为数据源指定唯一标识
atomikosDataSourceBean.setUniqueResourceName("oracleDataSource");
atomikosDataSourceBean.setMinPoolSize(1);
atomikosDataSourceBean.setMaxPoolSize(10);
atomikosDataSourceBean.setMaxIdleTime(600000);
//获取连接的最大等待时间（单位：秒），超时抛出异常。默认 0（无限等待），建议设为 30 秒。
atomikosDataSourceBean.setBorrowConnectionTimeout(300);
// 每分钟检查空闲连接（单位：秒）‌
atomikosDataSourceBean.setMaintenanceInterval(60);
//事务超时后强制回收连接的等待时间（单位：秒），默认为 0（不启用）。
atomikosDataSourceBean.setReapTimeout(20); // 事务超时20秒后回收‌:
atomikosDataSourceBean.setXaDataSource(xaDataSource);
return atomikosDataSourceBean;
}
/**
* 将这个对象放入spring容器中（交给Spring管理）
* @ConfigurationProperties 自动配置属性
*/
@Bean
@ConfigurationProperties(prefix = "spring.datasource.bak")
public XADataSource getDataSourceBak() throws SQLException {
// 创建XA连接池
if("2".equals(PropertiesUtil.getValue("BakDBType"))){
OracleXADataSource oracleXADataSource = new OracleXADataSource();
oracleXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
oracleXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
return oracleXADataSource;
}else if("4".equals(PropertiesUtil.getValue("BakDBType"))){
MysqlXADataSource oracleXADataSource = new MysqlXADataSource();
oracleXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
oracleXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
return oracleXADataSource;
}
return null;
}
@Bean(name = "bakDataSource")
@DependsOn({"getDataSourceBak","jtatransactionManager"})
public DataSource bakDataSource(@Qualifier("getDataSourceBak") XADataSource xaDataSource) {
AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
//atomikosDataSourceBean.setXaDataSourceClassName("com.zaxxer.hikari.HikariXADataSource");
// 必须为数据源指定唯一标识
atomikosDataSourceBean.setUniqueResourceName("mysqlDataSource");
atomikosDataSourceBean.setMinPoolSize(1);
atomikosDataSourceBean.setMaxPoolSize(10);
// 空闲连接保留 300 秒（5分钟）‌
atomikosDataSourceBean.setMaxIdleTime(600000);
atomikosDataSourceBean.setTestQuery("select 1");
//获取连接的最大等待时间（单位：秒），超时抛出异常。默认 0（无限等待），建议设为 30 秒。
atomikosDataSourceBean.setBorrowConnectionTimeout(300);
// 每分钟检查空闲连接（单位：秒）‌
atomikosDataSourceBean.setMaintenanceInterval(60);
//事务超时后强制回收连接的等待时间（单位：秒），默认为 0（不启用）。
atomikosDataSourceBean.setReapTimeout(20); // 事务超时20秒后回收‌:
atomikosDataSourceBean.setXaDataSource(xaDataSource);
Properties properties = new Properties();
properties.put("default_jta_timeout", "600000"); // 例如设置为60秒
properties.put("max_timeout", "600000"); // 例如设置为60秒
atomikosDataSourceBean.setXaProperties(properties);
atomikosDataSourceBean.setUniqueResourceName("db_petrol");
atomikosDataSourceBean.setMinPoolSize(3);
atomikosDataSourceBean.setMaxPoolSize(25);
atomikosDataSourceBean.setMaxLifetime((int) hikariConfig().getMaxLifetime());
atomikosDataSourceBean.setBorrowConnectionTimeout(60000);
atomikosDataSourceBean.setLoginTimeout(60000);
atomikosDataSourceBean.setMaintenanceInterval(60000);
atomikosDataSourceBean.setMaxIdleTime(60000);
atomikosDataSourceBean.setReapTimeout(60000);
atomikosDataSourceBean.setTestQuery("SELECT 1 FROM DUAL");
return atomikosDataSourceBean;
}
@Bean(name = "commonDataSource")
@ConfigurationProperties(prefix = "spring.datasource.main")
public DataSource commonDataSource() {
HikariDataSource build = DataSourceBuilder.create().type(HikariDataSource.class).build();
build.setConnectionTimeout(600000);
build.setMinimumIdle(2);
build.setMaximumPoolSize(10);
build.setMaxLifetime(1800000);
build.setIdleTimeout(60000);
return build;
}
public static DataSource initSource(String sourceType){
DataSourceConfig dsc=new DataSourceConfig();
try{
if("PRIMARY".equals(sourceType)){
return (DataSource) dsc.getDataSourcePrimary();
}else if("BAK".equals(sourceType)){
return (DataSource)dsc.getDataSourcePrimary();
}else if("COMMON".equals(sourceType)){
// return dsc.commonDataSource();
return (DataSource) dsc.getDataSourcePrimary();
@Primary
@Bean(name = "db_bak")
@ConfigurationProperties(prefix = "spring.datasource.db-bak")
@DependsOn("transactionManager")
public DataSource dBSrcBak() throws SQLException {
AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
String DBType = PropertiesUtil.getValue("BakDBType");
if(DBType.equals("2")){
OracleXADataSource oracleXADataSource = new OracleXADataSource();
oracleXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
oracleXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
atomikosDataSourceBean.setXaDataSource(oracleXADataSource);
}else if(DBType.equals("4")){
MysqlXADataSource mysqlXADataSource = new MysqlXADataSource();
mysqlXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
mysqlXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
mysqlXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
atomikosDataSourceBean.setXaDataSource(mysqlXADataSource);
}
}catch (Exception e){
e.printStackTrace();
}
return null;
Properties properties = new Properties();
properties.put("default_jta_timeout", "600000"); // 例如设置为60秒
properties.put("max_timeout", "600000"); // 例如设置为60秒
atomikosDataSourceBean.setXaProperties(properties);
atomikosDataSourceBean.setUniqueResourceName("db_bak");
atomikosDataSourceBean.setMinPoolSize(3);
atomikosDataSourceBean.setMaxPoolSize(25);
atomikosDataSourceBean.setMaxLifetime((int) hikariConfig().getMaxLifetime());
atomikosDataSourceBean.setBorrowConnectionTimeout(60000);
atomikosDataSourceBean.setLoginTimeout(60000);
atomikosDataSourceBean.setMaintenanceInterval(60000);
atomikosDataSourceBean.setMaxIdleTime(60000);
atomikosDataSourceBean.setReapTimeout(60000);
atomikosDataSourceBean.setTestQuery("SELECT 1 FROM DUAL");
return atomikosDataSourceBean;
}
}

110
src/main/java/com/nmgs/config/MybatisConfig.java
Unescape Escape View File

@ -8,11 +8,13 @@ import com.nmgs.util.PropertiesUtil;
import org.apache.ibatis.logging.stdout.StdOutImpl;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import javax.sql.DataSource;
@ -33,112 +35,4 @@ public class MybatisConfig {
}
return interceptor;
}
@Configuration
@MapperScan(
basePackages = "com.nmgs.mapperset.mysqlmapper",
sqlSessionFactoryRef = "mysqlSqlSessionFactory"
)
public static class MysqlMyBatisConfig {
@Autowired
@Qualifier("bakDataSource")
private DataSource bakDataSource;
@Autowired
@Qualifier("mybatisPlusInterceptor")
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Bean
public SqlSessionFactory mysqlSqlSessionFactory() throws Exception {
SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
if(bakDataSource==null){
bakDataSource=DataSourceConfig.initSource("BAK");
}
sessionFactory.setDataSource(bakDataSource);
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor );
configuration.setCallSettersOnNulls(true);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
sessionFactory.setConfiguration(configuration);
sessionFactory.setMapperLocations(
new PathMatchingResourcePatternResolver()
.getResources("classpath:com/nmgs/mapperset/mysqlmapper/*.xml")
);
return sessionFactory.getObject();
}
}
@Configuration
@MapperScan(
basePackages = "com.nmgs.mapperset.oraclemapper",
sqlSessionFactoryRef = "oracleSqlSessionFactory"
)
public static class OracleMyBatisConfig {
@Autowired
@Qualifier("primaryDataSource")
private DataSource primaryDataSource;
@Autowired
@Qualifier("mybatisPlusInterceptor")
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Bean
public SqlSessionFactory oracleSqlSessionFactory() throws Exception {
SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
sessionFactory.setDataSource(primaryDataSource);
if(primaryDataSource==null){
primaryDataSource=DataSourceConfig.initSource("PRIMARY");
}
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor );
configuration.setCallSettersOnNulls(true);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
sessionFactory.setConfiguration(configuration);
sessionFactory.setMapperLocations(
new PathMatchingResourcePatternResolver()
.getResources("classpath:com/nmgs/mapperset/oraclemapper/*.xml")
);
return sessionFactory.getObject();
}
}
@Configuration
@MapperScan(
basePackages = "com.nmgs.mappercommon",
sqlSessionFactoryRef = "commonSqlSessionFactory"
)
public static class commonMyBatisConfig {
@Autowired
@Qualifier("primaryDataSource")
private DataSource commonDataSource;
@Autowired
@Qualifier("mybatisPlusInterceptor")
private MybatisPlusInterceptor mybatisPlusInterceptor;
@Bean
public SqlSessionFactory commonSqlSessionFactory() throws Exception {
SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
if(commonDataSource==null){
commonDataSource=DataSourceConfig.initSource("COMMON");
}
sessionFactory.setDataSource(commonDataSource);
MybatisConfiguration configuration = new MybatisConfiguration();
configuration.addInterceptor(mybatisPlusInterceptor );
configuration.setCallSettersOnNulls(true);
// 配置打印sql语句
if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
configuration.setLogImpl(StdOutImpl.class);
}
sessionFactory.setConfiguration(configuration);
sessionFactory.setMapperLocations(
new PathMatchingResourcePatternResolver()
.getResources("classpath:com/nmgs/mappercommon/*.xml")
);
return sessionFactory.getObject();
}
}
}

25
src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.java
Unescape Escape View File

@ -0,0 +1,25 @@
package com.nmgs.mapperset.oraclemapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nmgs.entity.MyReturnMap;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
//@org.apache.ibatis.annotations.Mapper
public interface Mapper extends BaseMapper<MyReturnMap> {
Map<String, Object> select(@Param("sql") String sql);
List selectforlist(@Param("sql") String sql);
int update(@Param("sql") String sql);
IPage<Map<String,Object>> selectpage(@Param("sql") String sql, Page<Map<String, Object>> page);
Map<String, Object> selectlow(@Param("sql") String sql);
List selectforlistlow(@Param("sql") String sql);
int insert(@Param("sql") String sql);
}

30
src/main/java/com/nmgs/mapperset/oraclemapper/Mapper.xml
Unescape Escape View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nmgs.mapperset.oraclemapper.Mapper">
<select id="select" parameterType="String" resultType="java.util.HashMap">
${sql}
</select>
<select id="selectforlist" parameterType="String" resultType="java.util.HashMap">
${sql}
</select>
<update id="update" parameterType="String">
${sql}
</update>
<insert id="insert" parameterType="String">
${sql}
</insert>
<select id="selectpage" parameterType="String" resultType="java.util.HashMap">
${sql}
</select>
<select id="selectlow" parameterType="String" resultType="java.util.HashMap">
${sql}
</select>
<select id="selectforlistlow" parameterType="String" resultType="java.util.HashMap">
${sql}
</select>
</mapper>

11
src/main/java/com/nmgs/service/impl/ApponintmentInfoServiceImpl.java
Unescape Escape View File

@ -3,23 +3,16 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.entity.Consistant;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.mysqlmapper.AppointmentInfoMyMapper;
import com.nmgs.mapperset.mysqlmapper.CafterTableMyMapper;
import com.nmgs.mapperset.mysqlmapper.IntegrationListMyMapper;
import com.nmgs.mapperset.mysqlmapper.UserTableMysqlMapper;
import com.nmgs.mapperset.oraclemapper.AppointmentInfoMapper;
import com.nmgs.mapperset.oraclemapper.CafterTableMapper;
import com.nmgs.mapperset.oraclemapper.IntegrationListMapper;
import com.nmgs.mapperset.oraclemapper.UserTableMapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.service.AppointmentInfoService;
import com.nmgs.service.UserTableService;
import com.nmgs.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
@ -318,7 +311,7 @@ public class ApponintmentInfoServiceImpl implements AppointmentInfoService {
}
@Override
@Transactional(value = "jtatransactionManager",timeout = 100)
@Transactional(value = "transactionManager",timeout = 100)
public JSONObject commit(String openId,String appointmentType,
String appointmentId,String aCarNo,
String serviceId,String operatorId,

2
src/main/java/com/nmgs/service/impl/CommonServiceImpl.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/com/nmgs/service/impl/IntegralAppServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

4
src/main/java/com/nmgs/service/impl/IntegralLevelMessageServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.IntegralLeavingMyMapper;
import com.nmgs.mapperset.oraclemapper.IntegralLeavingMapper;
import com.nmgs.service.IntegralLevelMessageService;
@ -82,7 +82,7 @@ public class IntegralLevelMessageServiceImpl implements IntegralLevelMessageServ
}
@Override
@Transactional(value = "jtatransactionManager",timeout = 10)
@Transactional(value = "transactionManager",timeout = 10)
public int commit(String userId, String positon, String message) {
int ret=1;
String currentDate=PubTools.getCurrentDate();

4
src/main/java/com/nmgs/service/impl/IntegralRebatSolveServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.IntegrationListMyMapper;
import com.nmgs.mapperset.mysqlmapper.UserTableMysqlMapper;
import com.nmgs.mapperset.oraclemapper.IntegrationListMapper;
@ -52,7 +52,7 @@ public class IntegralRebatSolveServiceImpl {
this.integrationListMyMapper = integrationListMyMapper;
}
@Transactional(value = "jtatransactionManager", timeout = 100)
@Transactional(value = "transactionManager", timeout = 100)
public int solveIntegralRebat(String userIdParam, String startTime) {
int ret = -1;
String sqlUserId = "select distinct USERID from integration_list_table " +

2
src/main/java/com/nmgs/service/impl/IntegralSeriveImpl.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.service.UserTableService;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;

4
src/main/java/com/nmgs/service/impl/IntegralSignServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.IntegralSignMyMapper;
import com.nmgs.mapperset.mysqlmapper.IntegrationListMyMapper;
import com.nmgs.mapperset.mysqlmapper.UserTableMysqlMapper;
@ -138,7 +138,7 @@ public class IntegralSignServiceImpl implements IntegralSignService {
}
@Override
@Transactional(value = "jtatransactionManager",timeout = 50)
@Transactional(value = "transactionManager",timeout = 300)
public int commit(String userId, String signDate) {
int ret=-1;
String currentDate = PubTools.getCurrentDate().substring(0,10);

2
src/main/java/com/nmgs/service/impl/IntegralStarSetupServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.Mapper;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/com/nmgs/service/impl/IntegrationListServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.service.IntegrationListService;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;

2
src/main/java/com/nmgs/service/impl/MessagePushServiceImpl.java
Unescape Escape View File

@ -3,7 +3,7 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.nmgs.entity.HttpParamDto;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.HttpClientUtil;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;

2
src/main/java/com/nmgs/service/impl/OperatorsServiceImpl.java
Unescape Escape View File

@ -19,7 +19,7 @@ import java.util.Map;
@Service
@Transactional(value = "jtatransactionManager", timeout = 100)
@Transactional(value = "transactionManager", timeout = 100)
public class OperatorsServiceImpl implements IOperatorsService {

6
src/main/java/com/nmgs/service/impl/QCodeInfoServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.entity.Consistant;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.AppointmentInfoMyMapper;
import com.nmgs.mapperset.mysqlmapper.CafterTableMyMapper;
import com.nmgs.mapperset.mysqlmapper.IntegrationListMyMapper;
@ -219,7 +219,7 @@ public class QCodeInfoServiceImpl {
public int failBackMoney(String content, String serverOperationId,String orderId) throws Exception {
return rollBackIntegral(content,serverOperationId,orderId);
}
@Transactional(value = "jtatransactionManager",timeout = 100)
@Transactional(value = "transactionManager",timeout = 100)
public int rollBackIntegral(String content, String serverOperationId,String orderId) throws Exception {
int ret=1;// -1 代表接口处理失败 1 处理成功 2 商户不存在 3订单已经退回 4 用户信息未找到
LogUtil.WriteLog_Info("调用红冲接口开始=====","QCodeInfoServiceImpl");
@ -583,7 +583,7 @@ public class QCodeInfoServiceImpl {
* @param payMoney 实际支付金额
* @return
*/
@Transactional(value = "jtatransactionManager",timeout = 100)
@Transactional(value = "transactionManager",timeout = 100)
public JSONObject solveQcodeRedis(String content, String serverOperationId,String orderId, Double payMoney,Double discountMoneyBefore,Double discountMoney){
String ret="-2";// -1 代表接口处理失败 1 处理成功 2 用户不存在 3 兑换积分大于用户可用积分 4 二维码信息过期 5 商户不存在 6 积分类型与消费方式不匹配 7 商户角色未设置 8 用户已冻结 9 折扣金额与消费积分不一致 10 请重新生成二维码 11 订单中商户与核销中的商户不匹配 12 订单已核销
JSONObject retJo=new JSONObject();

2
src/main/java/com/nmgs/service/impl/RotationServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;
import com.nmgs.util.PubTools;

2
src/main/java/com/nmgs/service/impl/SelectDataImpl.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/com/nmgs/service/impl/SerivceAreaOperationMealServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/com/nmgs/service/impl/ServiceAreaPicServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;
import com.nmgs.util.PubTools;

2
src/main/java/com/nmgs/service/impl/ServiceAreaServiceImpl.java
Unescape Escape View File

@ -1,5 +1,5 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.*;
import com.nmgs.mapperset.oraclemapper.Mapper;
import com.nmgs.service.IServiceAreaService;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;

2
src/main/java/com/nmgs/service/impl/ServiceAreaSpecialServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.service.IServiceAreaSpecialService;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PubTools;

2
src/main/java/com/nmgs/service/impl/SolveUserAndVehcleServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.util.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

6
src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.UserTableMysqlMapper;
import com.nmgs.mapperset.oraclemapper.UserTableMapper;
import com.nmgs.service.UserTableService;
@ -91,7 +91,7 @@ public class UserTableServiceImpl implements UserTableService {
}
@Override
@Transactional(value = "jtatransactionManager", timeout = 40)
@Transactional(value = "transactionManager", timeout = 40)
public int addUser(String openId, String userName) {
int ret=-1;
//查询全部人员，给list赋值推荐码
@ -156,7 +156,7 @@ public class UserTableServiceImpl implements UserTableService {
}
@Override
@Transactional(value = "jtatransactionManager", timeout = 40)
@Transactional(value = "transactionManager", timeout = 40)
public int updateUser(String userId,String idNumber,String phone,String realName,String numberPic) {
int ret = 1;
//图片加水印

8
src/main/java/com/nmgs/service/impl/UserVehicleServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package com.nmgs.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mapperset.mysqlmapper.UserVehicleMyMapper;
import com.nmgs.mapperset.oraclemapper.UserVehicleMapper;
import com.nmgs.service.UserVehicleService;
@ -83,7 +83,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
}
@Override
@Transactional(value = "jtatransactionManager")
@Transactional(value = "transactionManager")
public int addUserVehicle(JSONArray jsonArray) {
int ret=1;
String currentDate=PubTools.getCurrentDate();
@ -153,7 +153,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
}
@Override
@Transactional(value = "jtatransactionManager")
@Transactional(value = "transactionManager")
public int cancelUserVehicle(String userId, String aCarNo) {
int ret=1;
String CREATETIME=PubTools.getCurrentDate() ;
@ -292,7 +292,7 @@ public class UserVehicleServiceImpl implements UserVehicleService {
return retlist;
}
@Override
@Transactional(value = "jtatransactionManager")
@Transactional(value = "transactionManager")
public int updateUserVehicle(String userId,String aCarNo,String checkName,String checkUserNumber,String licensepic,
String permitpic,String vehiclePic,String certification,String referrerCode) {
int ret=1;

2
src/main/java/com/nmgs/service/impl/VehicleScoreServiceImpl.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.nmgs.service.impl;
import com.nmgs.mapperset.oraclemapper.*;
import com.nmgs.mappercommon.Mapper;
import com.nmgs.service.VehicleScoreService;
import com.nmgs.util.LogUtil;
import com.nmgs.util.PropertiesUtil;

6
src/main/resources/jta.properties
Unescape Escape View File

@ -0,0 +1,6 @@
# ??????????????????10???600000?
com.atomikos.icatch.default_jta_timeout=600000
# ????????????????default_jta_timeout
com.atomikos.icatch.max_timeout=3600000
com.atomikos.icatch.log_base_dir = ./IntegralManager/tmlog
com.atomikos.icatch.log_base_name=IntegralManager

29
src/main/resources/logback-spring.xml
Unescape Escape View File

@ -216,35 +216,6 @@
<appender-ref ref="INFO"/>
</appender>
<!--异步输出-->
<!-- <appender name="SQL_ASYNC_LOG" class="ch.qos.logback.classic.AsyncAppender">-->
<!-- &lt;!&ndash; 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 &ndash;&gt;-->
<!-- <discardingThreshold>0</discardingThreshold>-->
<!-- &lt;!&ndash; 更改默认的队列的深度,该值会影响性能.默认值为256 &ndash;&gt;-->
<!-- <queueSize>2048</queueSize>-->
<!-- <includeCallerData>true</includeCallerData>-->
<!-- &lt;!&ndash; 添加附加的appender,最多只能添加一个 &ndash;&gt;-->
<!-- <appender-ref ref="SQL"/>-->
<!-- </appender>-->
<!--
<logger>用来设置某一个包或者具体的某一个类的日志打印级别、
以及指定<appender>。<logger>仅有一个name属性，
一个可选的level和一个可选的addtivity属性。
name:用来指定受此logger约束的某一个包或者具体的某一个类。
level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
如果未设置此属性，那么当前logger将会继承上级的级别。
addtivity:是否向上级logger传递打印信息。默认是true。
-->
<!-- <logger name="dao" level="ERROR">-->
<!-- <appender-ref ref="SQL"/>-->
<!-- <appender-ref ref="STDOUT"/>-->
<!-- </logger>-->
<root level="${logLevel}">
<appender-ref ref="STDOUT"/>
<appender-ref ref="fileAppender"/>

7
src/main/resources/static/application.properties
Unescape Escape View File

@ -100,6 +100,7 @@ mybatis.configuration.call-setters-on-nulls=true
Downfilepth= classpath:/static/tt.txt
#??jta????
spring.jta.enabled=true
spring.jta.transaction-manager-id=integralManager
spring.jta.log-dir=classpath:/static/View/logs
spring.jta.atomikos.properties.log-base-name=IntegralManager.log
spring.jta.atomikos.properties.enable-logging=false
spring.jta.transaction-manager-id=integralManager-tmlog
spring.jta.log-base-dir=./logs
spring.jta.atomikos.properties.log-base-name=integral-atomikos

Write Preview
Loading…
Cancel
Save