修改配置文件
This commit is contained in:
parent
3ff842296c
commit
d9bba9eb20
|
|
@ -4,59 +4,40 @@
|
|||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="7985a41e-99ed-4d36-8f6a-131c69344f36" name="Changes" comment="修改">
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/pom.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteConfigService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteDeptService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteDictDataService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteDictTypeService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteLogService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteMenuService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteNoticeService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemotePostService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteProfileService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteRoleService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteSbdUserService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUserService.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/RoleParams.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysAddress.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysConfig.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictData.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDictType.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysFile.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogininfor.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysMenu.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysNotice.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysOperLog.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysPost.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTemplate.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysTemplateMenu.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUserRole.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteConfigFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDeptFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictDataFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictTypeFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteMenuFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteNoticeFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemotePostFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteProfileFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteRoleFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteSbdUserFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/LoginUser.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/model/SbdUser.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<list default="true" id="7985a41e-99ed-4d36-8f6a-131c69344f36" name="Changes" comment="修改gateway">
|
||||
<change afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-security/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-security/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameBmw/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/55application.properties" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/bootstrap.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameMw/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameMw/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/application.properties" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/bootstrap.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-czl-service/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-czl-service/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-czl-service/src/main/resources/application.properties55" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-czl-service/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-czl-service/src/main/resources/bootstrap.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteConfigFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteConfigFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDeptFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDeptFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictDataFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictDataFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictTypeFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictTypeFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteMenuFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteMenuFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteNoticeFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteNoticeFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemotePostFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemotePostFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteProfileFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteProfileFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteRoleFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteRoleFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteSbdUserFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteSbdUserFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-gateway/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/application-druid.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/application-prod.yml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap.yml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn_czl_screen/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/hn_czl_screen/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/src/main/resources/bootstrap.yml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -83,10 +64,18 @@
|
|||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"Maven.HnRealNameBmw [clean].executor": "Run",
|
||||
"Maven.HnRealNameBmw [install].executor": "Run",
|
||||
"Maven.HnRealNameMmw [clean].executor": "Run",
|
||||
"Maven.HnRealNameMmw [install].executor": "Run",
|
||||
"Maven.bonus-common [clean].executor": "Run",
|
||||
"Maven.hn-czl-service [clean].executor": "Run",
|
||||
"Maven.hn-czl-service [install].executor": "Run",
|
||||
"Maven.hn-gateway [clean].executor": "Run",
|
||||
"Maven.hn-gateway [install].executor": "Run",
|
||||
"Maven.hn-gateway [verify].executor": "Run",
|
||||
"Maven.hn_czl_screen [clean].executor": "Run",
|
||||
"Maven.hn_czl_screen [install].executor": "Run",
|
||||
"Maven.ldlz [clean].executor": "Run",
|
||||
"Maven.ldlz [install].executor": "Run",
|
||||
"RequestMappingsPanelOrder0": "0",
|
||||
|
|
@ -97,12 +86,14 @@
|
|||
"RunOnceActivity.git.unshallow": "true",
|
||||
"SONARLINT_PRECOMMIT_ANALYSIS": "true",
|
||||
"Spring Boot.BonusGatewayApplication.executor": "Run",
|
||||
"Spring Boot.CzlScreenApplication.executor": "Run",
|
||||
"Spring Boot.CzlServiceApplication.executor": "Run",
|
||||
"Spring Boot.HnRealNameBmwApplication.executor": "Run",
|
||||
"Spring Boot.LdlzApplication.executor": "Run",
|
||||
"Spring Boot.RnmwApplication.executor": "Debug",
|
||||
"git-widget-placeholder": "main",
|
||||
"kotlin-language-version-configured": "true",
|
||||
"last_opened_file_path": "F:/workspace/idea/hn_cloud_service/hn-gateway",
|
||||
"last_opened_file_path": "F:/workspace/idea/hn_cloud_service/hn-czl-service/src/main/resources",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
|
|
@ -121,12 +112,14 @@
|
|||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="F:\workspace\idea\hn_cloud_service\hn-czl-service\src\main\resources" />
|
||||
<recent name="F:\workspace\idea\hn_cloud_service\hn-gateway" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunAnythingCache">
|
||||
<option name="myCommands">
|
||||
<command value="mvn clean" />
|
||||
<command value="mvn install" />
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
|
|
@ -139,7 +132,7 @@
|
|||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Spring Boot.BonusGatewayApplication">
|
||||
<component name="RunManager" selected="Spring Boot.CzlScreenApplication">
|
||||
<configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
|
||||
<module name="bonus-gateway" />
|
||||
<option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" />
|
||||
|
|
@ -214,7 +207,7 @@
|
|||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1764725740407</updated>
|
||||
<workItem from="1764725741842" duration="6962000" />
|
||||
<workItem from="1764725741842" duration="9893000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="修改">
|
||||
<option name="closed" value="true" />
|
||||
|
|
@ -232,7 +225,15 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1764741286487</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<task id="LOCAL-00003" summary="修改gateway">
|
||||
<option name="closed" value="true" />
|
||||
<created>1764742057175</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1764742057175</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="4" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
@ -302,7 +303,8 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="修改" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="修改" />
|
||||
<MESSAGE value="修改gateway" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="修改gateway" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
|
|||
|
|
@ -394,23 +394,6 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install-jna-jar</id>
|
||||
<phase>clean</phase>
|
||||
<configuration>
|
||||
<file>${project.basedir}/libs/aspose-words-15.8.0-jdk16.jar</file>
|
||||
<groupId>com.aspose.words</groupId>
|
||||
<artifactId>aspose-words</artifactId>
|
||||
<version>15.8.0</version>
|
||||
<packaging>jar</packaging>
|
||||
<generatePom>true</generatePom>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>install-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
|
|
|||
|
|
@ -1,108 +0,0 @@
|
|||
server.port=1918
|
||||
#server.port=19118
|
||||
#server.port=1921
|
||||
server.servlet.context-path=/hnBmw
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.14:1116/hn_real_name_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=plzhnreal@mysql123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.70:13306/hn_real_name?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Hnsmz@mysql123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://116.63.172.211:13306/hn_real_name?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Hnsmz@mysql123!
|
||||
|
||||
|
||||
spring.datasource.url=jdbc:mysql://192.168.0.14:4418/hn_real_name_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
spring.datasource.username=root
|
||||
spring.datasource.password=Bonus@admin123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://172.16.0.235:13306/hn_real_name?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Hnsmz@mysql123!
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.70:13306/hn_real_name?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=Hnsmz@mysql123!
|
||||
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/hn_real_name_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=HAY@xyksj666
|
||||
|
||||
#spring.datasource.url=jdbc:mysql://1
|
||||
|
||||
spring.datasource.initialSize=5
|
||||
spring.datasource.minIdle=5
|
||||
spring.datasource.maxActive=60
|
||||
spring.datasource.maxWait=60000
|
||||
spring.datasource.timeBetweenEvictionRunsMillis=60000
|
||||
spring.datasource.minEvictableIdleTimeMillis=300000
|
||||
spring.datasource.validationQuery=SELECT 1
|
||||
spring.datasource.testWhileIdle=true
|
||||
spring.datasource.testOnBorrow=true
|
||||
spring.datasource.testOnReturn=false
|
||||
spring.datasource.poolPreparedStatements=true
|
||||
spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
|
||||
spring.datasource.filters=stat,wall,log4j
|
||||
spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
spring.devtools.restart.enabled=false
|
||||
spring.devtools.restart.additional-paths=src/main/java
|
||||
|
||||
server.session.timeout=10
|
||||
server.tomcat.uri-encoding=UTF-8
|
||||
mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
|
||||
mybatis.type-aliases-package=com.bonus.hnrn.rnbmw.*.entity
|
||||
mybatis.configuration.mapUnderscoreToCamelCase=true
|
||||
#redis config
|
||||
|
||||
#spring.redis.host=192.168.0.14
|
||||
#spring.redis.port=2001
|
||||
#spring.redis.password=Dszbns@Redis123!
|
||||
#spring.redis.host=192.168.0.14
|
||||
#spring.redis.port=2004
|
||||
#spring.redis.password=Plzbns@Redis123!
|
||||
#spring.redis.host=192.168.0.70
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.password=Hnsmz@070redis!
|
||||
|
||||
#spring.redis.host=116.63.172.211
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.password=Hnsmz@070redis!
|
||||
spring.redis.host=127.0.0.1
|
||||
spring.redis.port=6379
|
||||
|
||||
|
||||
#spring.redis.host=172.16.0.235
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.password=Hnsmz@070redis!
|
||||
|
||||
#spring.redis.host=127.0.0.1
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.password=HAY@xyksj666
|
||||
|
||||
logging.config=classpath:logback-boot.xml
|
||||
log.level.root=info
|
||||
log.level.my=debug
|
||||
log.file=logs/sys-back.log
|
||||
log.maxsize=30MB
|
||||
server.max-http-header-size=102400
|
||||
spring.servlet.multipart.max-file-size=-1
|
||||
spring.servlet.multipart.max-request-size=-1
|
||||
spring.http.multipart.maxFileSize=10Mb
|
||||
spring.http.multipart.maxRequestSize=10Mb
|
||||
token.expire.seconds=7200
|
||||
spring.servlet.multipart.enabled=true
|
||||
#files.path=/data/gz_real_name
|
||||
files.path=/rdata/gz_real_name/
|
||||
#files.path=H://files/
|
||||
#files.path=E:
|
||||
#\u767B\u5F55\u9A8C\u8BC1\u7801\u8FC7\u671F\u65F6\u95F4\uFF0C\u5355\u4F4D \u5206\u949F
|
||||
loginCode.expiration = 3
|
||||
#\u9A8C\u8BC1\u7801redis\u7684key\u503C\u524D\u7F00
|
||||
loginCode.prefix = login_code
|
||||
|
||||
|
|
@ -30,27 +30,6 @@ spring:
|
|||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
|
||||
|
||||
|
||||
# datasource:
|
||||
# driverClassName: com.mysql.cj.jdbc.Driver
|
||||
# url: jdbc:mysql://192.168.0.14:4418/hn_real_name_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
|
||||
# username: root
|
||||
# password: Bonus@admin123!
|
||||
# max-idle: 10
|
||||
# max-wait: 60000
|
||||
# min-idle: 5
|
||||
# initial-size: 5
|
||||
# redis:
|
||||
# host: 192.168.0.14
|
||||
# port: 2004
|
||||
# password: Plzbns@Redis123!
|
||||
|
||||
# mybatis配置
|
||||
mybatis:
|
||||
mapper-locations: classpath:mappers/*/*Mapper.xml
|
||||
type-aliases-package: com.bonus.hnrn.rnbmw.*.entity
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: INFO
|
||||
|
|
|
|||
|
|
@ -399,23 +399,6 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install-jna-jar</id>
|
||||
<phase>clean</phase>
|
||||
<configuration>
|
||||
<file>${project.basedir}/libs/aspose-words-15.8.0-jdk16.jar</file>
|
||||
<groupId>com.aspose.words</groupId>
|
||||
<artifactId>aspose-words</artifactId>
|
||||
<version>15.8.0</version>
|
||||
<packaging>jar</packaging>
|
||||
<generatePom>true</generatePom>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>install-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
#server.port=1917
|
||||
#server.servlet.context-path=/hnMw
|
||||
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.14:1116/hn_real_name?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password= plzhnreal@mysql123!
|
||||
#spring.datasource.initialSize=5
|
||||
#spring.datasource.minIdle=5
|
||||
#spring.datasource.maxActive=60
|
||||
#spring.datasource.maxWait=60000
|
||||
#spring.datasource.timeBetweenEvictionRunsMillis=60000
|
||||
#spring.datasource.minEvictableIdleTimeMillis=300000
|
||||
#spring.datasource.validationQuery=SELECT 1
|
||||
#spring.datasource.testWhileIdle=true
|
||||
#spring.datasource.testOnBorrow=true
|
||||
#spring.datasource.testOnReturn=false
|
||||
#spring.datasource.poolPreparedStatements=true
|
||||
#spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
|
||||
#spring.datasource.filters=stat,wall,log4j
|
||||
#spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
|
||||
#
|
||||
#server.session.timeout=10
|
||||
#server.tomcat.uri-encoding=UTF-8
|
||||
#mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
|
||||
#mybatis.type-aliases-package=com.bonus.hnrn.rnmw.*.entity
|
||||
##redis config
|
||||
#spring.redis.host=192.168.0.14
|
||||
#spring.redis.port=2001
|
||||
#spring.redis.password=Dszbns@Redis123!
|
||||
## \uFFFD\uFFFD\u05BE
|
||||
#logging.config=classpath:logback-boot.xml
|
||||
#log.level.root=info
|
||||
#log.level.my=debug
|
||||
#log.file=logs/sys-back.log
|
||||
#log.maxsize=30MB
|
||||
##\uFFFD\uFFFD\uFFFD\uFFFD\u0377\uFFFD\uFFFD\u0421
|
||||
#server.max-http-header-size=102400
|
||||
#spring.servlet.multipart.max-file-size=-1
|
||||
#spring.servlet.multipart.max-request-size=-1
|
||||
#spring.http.multipart.maxFileSize=10Mb
|
||||
#spring.http.multipart.maxRequestSize=10Mb
|
||||
##\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
|
||||
##spring.security.user.name=zys
|
||||
##spring.security.user.password=123
|
||||
#token.expire.seconds=7200
|
||||
##\uFFFD\u013C\uFFFD\uFFFD\u03F4\uFFFD
|
||||
#spring.servlet.multipart.enabled=true
|
||||
|
|
@ -31,26 +31,6 @@ spring:
|
|||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
|
||||
|
||||
|
||||
# datasource:
|
||||
# driverClassName: com.mysql.cj.jdbc.Driver
|
||||
# url: jdbc:mysql://192.168.0.14:4418/hn_real_name_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
|
||||
# username: root
|
||||
# password: Bonus@admin123!
|
||||
# max-idle: 10
|
||||
# max-wait: 60000
|
||||
# min-idle: 5
|
||||
# initial-size: 5
|
||||
# redis:
|
||||
# host: 192.168.0.14
|
||||
# port: 2004
|
||||
# password: Plzbns@Redis123!
|
||||
|
||||
# mybatis配置
|
||||
mybatis:
|
||||
mapper-locations: classpath:mappers/*/*Mapper.xml
|
||||
type-aliases-package: com.bonus.hnrn.rnbmw.*.entity
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: INFO
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
</parent>
|
||||
<groupId>com.bonus.boot</groupId>
|
||||
<artifactId>hn-czl-service</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<name>hn-czl</name>
|
||||
<description>hn-czl</description>
|
||||
<properties>
|
||||
|
|
@ -65,11 +64,10 @@
|
|||
<version>2.1.0.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alibaba.cloud</groupId>-->
|
||||
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
|
||||
<!-- <version>2021.1</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- spring-boot-devtools -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
#本地端口
|
||||
server.port=19993
|
||||
#访问路径
|
||||
server.servlet.context-path=/hnbcbackstage
|
||||
#mysql数据库连接
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/bearing_capacity_test?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=root
|
||||
#spring.datasource.password=xbzadmin@szedu14!
|
||||
spring.datasource.url=jdbc:mysql://127.0.0.1:3306/hn_czl?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
|
||||
spring.datasource.username=mroot
|
||||
spring.datasource.password=bonus@admin123
|
||||
#spring.datasource.url=jdbc:mysql://192.168.0.70:2000/bearing_capacity?useUnicode=true&characterEncoding=utf-8\
|
||||
# &allowMultiQueries=true&useSSL=false
|
||||
#spring.datasource.username=ENC(ptwW/oDKb0LBmgKSPTBM2pEtDJVf0bdbdS18lCGMJjjrwZsdDRVfDB9hR77b1G5G)
|
||||
#spring.datasource.password=ENC(lj1uFztJiKboX3HFBS50Hb/mOmkBG4qOao5ALg5ePI96pAqmlYor/DApxduukyG6)
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.max-idle=10
|
||||
spring.datasource.max-wait=60000
|
||||
spring.datasource.min-idle=5
|
||||
spring.datasource.initial-size=5
|
||||
server.session.timeout=10
|
||||
server.tomcat.uri-encoding=UTF-8
|
||||
|
||||
loginCode.expiration = 3
|
||||
loginCode.prefix = login_code
|
||||
|
||||
#mapper配置
|
||||
mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml
|
||||
mybatis.type-aliases-package=com.bonus.hn.bearing.capacity.backstage.*.entity
|
||||
#redis config
|
||||
spring.redis.host=127.0.0.1
|
||||
spring.redis.port=6379
|
||||
#spring.redis.password=ENC(aTYkT55ahxH5SoZptk4ZMuPFi05ilX4mxOnFJJtKDSgRTP0HICSedxcY+mrNiC4Y)
|
||||
#spring.redis.host=192.168.0.70
|
||||
#spring.redis.port=6379
|
||||
#spring.redis.password=Hnsmz@070redis!
|
||||
#spring.redis.host=192.168.0.7
|
||||
#spring.redis.port=16379
|
||||
#spring.redis.password=Bonus@admin123!
|
||||
# 日志
|
||||
logging.config=classpath:logback-boot.xml
|
||||
log.level.root=info
|
||||
log.level.my=debug
|
||||
log.file=logs/sys-back.log
|
||||
log.maxsize=30MB
|
||||
#请求头大小
|
||||
server.max-http-header-size=102400
|
||||
spring.servlet.multipart.max-file-size=20MB
|
||||
spring.servlet.multipart.max-request-size=20MB
|
||||
spring.http.multipart.maxFileSize=10Mb
|
||||
spring.http.multipart.maxRequestSize=10Mb
|
||||
#配置用户名密码
|
||||
#spring.security.user.name=zys
|
||||
#spring.security.user.password=123
|
||||
token.expire.seconds=7200
|
||||
#文件上传
|
||||
spring.servlet.multipart.enabled=true
|
||||
#files.path=d:\\files
|
||||
files.path=/data/hnczl
|
||||
#files.upload=d:\\files
|
||||
#????
|
||||
jasypt.encryptor.password=Encrypt
|
||||
|
|
@ -13,6 +13,9 @@ server:
|
|||
spring:
|
||||
application:
|
||||
name: bonus-czl
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
# nacos.core.auth.enabled=true 开启权限验证
|
||||
|
|
@ -25,26 +28,9 @@ spring:
|
|||
config:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
|
||||
datasource:
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://192.168.0.14:2009/hn_czl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: Bonus@admin123!
|
||||
max-idle: 10
|
||||
max-wait: 60000
|
||||
min-idle: 5
|
||||
initial-size: 5
|
||||
redis:
|
||||
host: 192.168.0.14
|
||||
port: 2003
|
||||
password: Fyzbns@Redis123!
|
||||
database: 15
|
||||
|
||||
# mybatis配置
|
||||
mybatis:
|
||||
mapper-locations: classpath:mappers/*/*Mapper.xml
|
||||
type-aliases-package: com.bonus.hn.bearing.capacity.backstage.**.entity
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
group: DEFAULT_GROUP
|
||||
|
||||
logging:
|
||||
level:
|
||||
|
|
@ -70,6 +56,3 @@ loginCode:
|
|||
jasypt:
|
||||
encryptor:
|
||||
password: Encrypt
|
||||
|
||||
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ import com.bonus.system.api.domain.SysConfig;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.bonus.system.api.RemoteDeptService;
|
|||
import com.bonus.system.api.domain.SysDept;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ import com.bonus.common.core.web.page.TableDataInfo;
|
|||
import com.bonus.system.api.RemoteDictDataService;
|
||||
import com.bonus.system.api.domain.SysDictData;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ import com.bonus.common.core.web.page.TableDataInfo;
|
|||
import com.bonus.system.api.RemoteDictTypeService;
|
||||
import com.bonus.system.api.domain.SysDictType;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package com.bonus.system.api.factory;
|
|||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import com.bonus.common.core.domain.R;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
package com.bonus.system.api.factory;
|
||||
|
||||
import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.system.api.domain.SysLogsVo;
|
||||
import com.google.common.collect.Maps;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
import com.bonus.common.core.domain.R;
|
||||
import com.bonus.system.api.RemoteLogService;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.bonus.system.api.RemoteMenuService;
|
|||
import com.bonus.system.api.domain.SysMenu;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import com.bonus.system.api.domain.SysNotice;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import com.bonus.system.api.domain.SysPost;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.bonus.system.api.RemoteProfileService;
|
|||
import com.bonus.system.api.domain.SysUser;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import com.bonus.system.api.domain.SysUserRole;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import com.bonus.system.api.model.SbdUser;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import com.bonus.system.api.domain.SysDept;
|
|||
import com.github.pagehelper.PageInfo;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import feign.hystrix.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
import com.bonus.common.core.domain.R;
|
||||
import com.bonus.system.api.RemoteUserService;
|
||||
|
|
|
|||
|
|
@ -83,12 +83,7 @@ public class SecurityUtils
|
|||
return token;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取登录部门id
|
||||
*/
|
||||
public static Long getDeptId() {
|
||||
return getLoginUser().getDeptId();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 是否为管理员
|
||||
|
|
|
|||
|
|
@ -79,12 +79,7 @@
|
|||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- FastDFS 分布式文件系统 -->
|
||||
<dependency>
|
||||
<groupId>com.github.tobato</groupId>
|
||||
<artifactId>fastdfs-client</artifactId>
|
||||
<version>${tobato.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- Swagger 依赖配置 -->
|
||||
<dependency>
|
||||
|
|
@ -191,12 +186,7 @@
|
|||
<version>${bonus.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 分布式事务 -->
|
||||
<dependency>
|
||||
<groupId>com.bonus</groupId>
|
||||
<artifactId>bonus-common-seata</artifactId>
|
||||
<version>${bonus.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- 日志记录 -->
|
||||
<dependency>
|
||||
|
|
@ -235,6 +225,7 @@
|
|||
<modules>
|
||||
<module>bonus-gateway</module>
|
||||
<module>bonus-common</module>
|
||||
<module>bonus-api</module>
|
||||
</modules>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,11 +22,10 @@
|
|||
<version>2.1.0.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alibaba.cloud</groupId>-->
|
||||
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
|
||||
<!-- <version>2021.1</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- spring-boot-devtools -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
# 数据源配置
|
||||
spring:
|
||||
application:
|
||||
name: bonus-ldlz
|
||||
cloud:
|
||||
nacos:
|
||||
# nacos.core.auth.enabled=true 开启权限验证
|
||||
username: nacos
|
||||
password: nacos
|
||||
discovery:
|
||||
# nacos地址
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
# config:
|
||||
# server-addr: 192.168.0.14:18848
|
||||
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.0.14:2009/ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: Bonus@admin123!
|
||||
# url: jdbc:mysql://192.168.0.31:30937/gold-pm-v2.0-hn-xssz-bns-ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: root
|
||||
# password: 5168cpT#
|
||||
# 从库数据源
|
||||
slave:
|
||||
# # 从数据源开关/默认关闭
|
||||
# enabled: false
|
||||
# url: jdbc:mysql://120.48.23.33:3307/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: ldlz
|
||||
# password: E2GWTDG45FRRBSBt
|
||||
# 初始连接数
|
||||
initialSize: 5
|
||||
# 最小连接池数量
|
||||
minIdle: 10
|
||||
# 最大连接池数量
|
||||
maxActive: 20
|
||||
# 配置获取连接等待超时的时间
|
||||
maxWait: 60000
|
||||
# 配置连接超时时间
|
||||
connectTimeout: 30000
|
||||
# 配置网络超时时间
|
||||
socketTimeout: 60000
|
||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
webStatFilter:
|
||||
enabled: true
|
||||
statViewServlet:
|
||||
enabled: true
|
||||
# 设置白名单，不填则允许所有访问
|
||||
allow:
|
||||
url-pattern: /druid/*
|
||||
# 控制台管理用户名和密码
|
||||
login-username: ldlz
|
||||
login-password: 123456
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
# 慢SQL记录
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
# 数据源配置
|
||||
spring:
|
||||
application:
|
||||
name: bonus-ldlz
|
||||
cloud:
|
||||
nacos:
|
||||
# nacos.core.auth.enabled=true 开启权限验证
|
||||
username: nacos
|
||||
password: nacos
|
||||
discovery:
|
||||
# nacos地址
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
# config:
|
||||
# server-addr: 192.168.0.14:18848
|
||||
# namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://192.168.0.14:2009/ldlz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: Bonus@admin123!
|
||||
# 从库数据源
|
||||
slave:
|
||||
# # 从数据源开关/默认关闭
|
||||
# enabled: false
|
||||
# url: jdbc:mysql://120.48.23.33:3307/zyry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
# username: ldlz
|
||||
# password: E2GWTDG45FRRBSBt
|
||||
# 初始连接数
|
||||
initialSize: 5
|
||||
# 最小连接池数量
|
||||
minIdle: 10
|
||||
# 最大连接池数量
|
||||
maxActive: 20
|
||||
# 配置获取连接等待超时的时间
|
||||
maxWait: 60000
|
||||
# 配置连接超时时间
|
||||
connectTimeout: 30000
|
||||
# 配置网络超时时间
|
||||
socketTimeout: 60000
|
||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
webStatFilter:
|
||||
enabled: true
|
||||
statViewServlet:
|
||||
enabled: true
|
||||
# 设置白名单，不填则允许所有访问
|
||||
allow:
|
||||
url-pattern: /druid/*
|
||||
# 控制台管理用户名和密码
|
||||
login-username: ldlz
|
||||
login-password: 123456
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
# 慢SQL记录
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# 数据源配置
|
||||
spring:
|
||||
application:
|
||||
name: bonus-ldlz
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
config:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
group: DEFAULT_GROUP
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# 数据源配置
|
||||
spring:
|
||||
application:
|
||||
name: bonus-ldlz
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
discovery:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
config:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
group: DEFAULT_GROUP
|
||||
|
|
@ -19,9 +19,6 @@ server:
|
|||
# 服务器的HTTP端口，默认为8080
|
||||
# port: 9001
|
||||
port: 42881
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /
|
||||
tomcat:
|
||||
# tomcat的URI编码
|
||||
uri-encoding: UTF-8
|
||||
|
|
@ -69,25 +66,7 @@ spring:
|
|||
# 热部署开关
|
||||
enabled: true
|
||||
# redis 配置
|
||||
redis:
|
||||
# 地址
|
||||
host: 192.168.0.14
|
||||
port: 2003
|
||||
password: Fyzbns@Redis123!
|
||||
database: 14
|
||||
# 密码
|
||||
# 连接超时时间
|
||||
timeout: 10s
|
||||
lettuce:
|
||||
pool:
|
||||
# 连接池中的最小空闲连接
|
||||
min-idle: 0
|
||||
# 连接池中的最大空闲连接
|
||||
max-idle: 8
|
||||
# 连接池的最大数据库连接数
|
||||
max-active: 8
|
||||
# #连接池最大阻塞等待时间（使用负值表示没有限制）
|
||||
max-wait: -1ms
|
||||
|
||||
|
||||
# token配置
|
||||
token:
|
||||
|
|
@ -63,11 +63,10 @@
|
|||
<version>2.1.0.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.alibaba.cloud</groupId>-->
|
||||
<!-- <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
|
||||
<!-- <version>2021.1</version>-->
|
||||
<!-- </dependency>-->
|
||||
<dependency>
|
||||
<groupId>com.alibaba.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- spring-boot-devtools -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ server:
|
|||
spring:
|
||||
application:
|
||||
name: bonus-czldp
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: dev
|
||||
cloud:
|
||||
nacos:
|
||||
# nacos.core.auth.enabled=true 开启权限验证
|
||||
|
|
@ -25,26 +28,10 @@ spring:
|
|||
config:
|
||||
server-addr: 192.168.0.14:18848
|
||||
namespace: e0337b55-080d-456e-8449-46d68dceee5b
|
||||
# 配置文件格式
|
||||
file-extension: yml
|
||||
group: DEFAULT_GROUP
|
||||
|
||||
datasource:
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://192.168.0.14:2009/hn_czl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: Bonus@admin123!
|
||||
max-idle: 10
|
||||
max-wait: 60000
|
||||
min-idle: 5
|
||||
initial-size: 5
|
||||
redis:
|
||||
host: 192.168.0.14
|
||||
port: 2003
|
||||
password: Fyzbns@Redis123!
|
||||
database: 15
|
||||
|
||||
# mybatis配置
|
||||
mybatis:
|
||||
mapper-locations: classpath:mappers/*/*Mapper.xml
|
||||
type-aliases-package: com.bonus.hn.bearing.capacity.backstage.**.entity
|
||||
|
||||
logging:
|
||||
level:
|
||||
Loading…
Reference in New Issue