统一版本
This commit is contained in:
parent
8ce304e81b
commit
dada22dfa4
|
|
@ -5,8 +5,15 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="30706c6d-35cd-44ba-b6ec-9865ccea7a75" name="Changes" comment="用户管理及下拉选查询接口开发">
|
<list default="true" id="30706c6d-35cd-44ba-b6ec-9865ccea7a75" name="Changes" comment="用户管理及下拉选查询接口开发">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/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/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-gateway/bonus-common/bonus-common-core/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-common/bonus-common-core/pom.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/hn-gateway/bonus-gateway/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/pom.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/hn_czl_screen/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/hn_czl_screen/pom.xml" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|
@ -31,6 +38,11 @@
|
||||||
<option name="userSettingsFile" value="D:\maven\apache-maven-3.6.1\conf\settings.xml" />
|
<option name="userSettingsFile" value="D:\maven\apache-maven-3.6.1\conf\settings.xml" />
|
||||||
</MavenGeneralSettings>
|
</MavenGeneralSettings>
|
||||||
</option>
|
</option>
|
||||||
|
<option name="importingSettings">
|
||||||
|
<MavenImportingSettings>
|
||||||
|
<option name="jdkForImporter" value="1.8" />
|
||||||
|
</MavenImportingSettings>
|
||||||
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectColorInfo">{
|
<component name="ProjectColorInfo">{
|
||||||
"customColor": "",
|
"customColor": "",
|
||||||
|
|
@ -64,8 +76,8 @@
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"RunOnceActivity.git.unshallow": "true",
|
"RunOnceActivity.git.unshallow": "true",
|
||||||
"SONARLINT_PRECOMMIT_ANALYSIS": "true",
|
"SONARLINT_PRECOMMIT_ANALYSIS": "true",
|
||||||
"Spring Boot.BonusGatewayApplication.executor": "Debug",
|
"Spring Boot.BonusGatewayApplication.executor": "Run",
|
||||||
"Spring Boot.CzlScreenApplication.executor": "Debug",
|
"Spring Boot.CzlScreenApplication.executor": "Run",
|
||||||
"Spring Boot.CzlServiceApplication.executor": "Run",
|
"Spring Boot.CzlServiceApplication.executor": "Run",
|
||||||
"Spring Boot.HnRealNameBmwApplication.executor": "Run",
|
"Spring Boot.HnRealNameBmwApplication.executor": "Run",
|
||||||
"Spring Boot.LdlzApplication.executor": "Run",
|
"Spring Boot.LdlzApplication.executor": "Run",
|
||||||
|
|
@ -84,7 +96,7 @@
|
||||||
"project.structure.proportion": "0.15",
|
"project.structure.proportion": "0.15",
|
||||||
"project.structure.side.proportion": "0.43843496",
|
"project.structure.side.proportion": "0.43843496",
|
||||||
"run.configurations.included.in.services": "true",
|
"run.configurations.included.in.services": "true",
|
||||||
"settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler",
|
"settings.editor.selected.configurable": "reference.settings.project.maven.importing",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
}
|
}
|
||||||
}]]></component>
|
}]]></component>
|
||||||
|
|
@ -126,7 +138,7 @@
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunManager" selected="Spring Boot.CzlServiceApplication">
|
<component name="RunManager" selected="Spring Boot.BonusGatewayApplication">
|
||||||
<configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
|
<configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
|
||||||
<module name="bonus-gateway" />
|
<module name="bonus-gateway" />
|
||||||
<option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" />
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.bonus.gateway.BonusGatewayApplication" />
|
||||||
|
|
@ -213,11 +225,11 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
<recent_temporary>
|
<recent_temporary>
|
||||||
<list>
|
<list>
|
||||||
<item itemvalue="Spring Boot.CzlServiceApplication" />
|
|
||||||
<item itemvalue="Spring Boot.LdlzApplication" />
|
|
||||||
<item itemvalue="Spring Boot.BonusGatewayApplication" />
|
<item itemvalue="Spring Boot.BonusGatewayApplication" />
|
||||||
<item itemvalue="Spring Boot.CzlScreenApplication" />
|
<item itemvalue="Spring Boot.CzlScreenApplication" />
|
||||||
|
<item itemvalue="Spring Boot.CzlServiceApplication" />
|
||||||
<item itemvalue="Spring Boot.RnmwApplication" />
|
<item itemvalue="Spring Boot.RnmwApplication" />
|
||||||
|
<item itemvalue="Spring Boot.LdlzApplication" />
|
||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -244,7 +256,7 @@
|
||||||
<workItem from="1765424267744" duration="6360000" />
|
<workItem from="1765424267744" duration="6360000" />
|
||||||
<workItem from="1765509604008" duration="11703000" />
|
<workItem from="1765509604008" duration="11703000" />
|
||||||
<workItem from="1765847372970" duration="757000" />
|
<workItem from="1765847372970" duration="757000" />
|
||||||
<workItem from="1765855068157" duration="514000" />
|
<workItem from="1765855068157" duration="2140000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="修改新增用户">
|
<task id="LOCAL-00001" summary="修改新增用户">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
|
|
@ -358,7 +370,15 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1765855232396</updated>
|
<updated>1765855232396</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="15" />
|
<task id="LOCAL-00015" summary="用户管理及下拉选查询接口开发">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1765855698513</created>
|
||||||
|
<option name="number" value="00015" />
|
||||||
|
<option name="presentableId" value="LOCAL-00015" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1765855698513</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="16" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
|
|
|
||||||
|
|
@ -368,7 +368,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<scope>provided</scope>
|
<version>1.18.24</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- Swagger 注解 -->
|
<!-- Swagger 注解 -->
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,8 @@ spring:
|
||||||
nacos:
|
nacos:
|
||||||
config:
|
config:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 127.0.0.1:8848
|
||||||
namespace: 07736b2e-9922-415e-8624-50b275be556e
|
namespace: 289db019-a290-4903-ac1a-5d341af8b272
|
||||||
|
# namespace: 07736b2e-9922-415e-8624-50b275be556e
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
group: DEFAULT_GROUP
|
group: DEFAULT_GROUP
|
||||||
|
|
@ -28,7 +29,8 @@ spring:
|
||||||
discovery:
|
discovery:
|
||||||
# nacos地址
|
# nacos地址
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 127.0.0.1:8848
|
||||||
namespace: 07736b2e-9922-415e-8624-50b275be556e
|
namespace: 289db019-a290-4903-ac1a-5d341af8b272
|
||||||
|
# namespace: 07736b2e-9922-415e-8624-50b275be556e
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
level:
|
level:
|
||||||
|
|
|
||||||
|
|
@ -162,6 +162,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.24</version> <!-- 替换原1.16.18,仅支持JDK1.8 -->
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,8 @@ spring:
|
||||||
nacos:
|
nacos:
|
||||||
config:
|
config:
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 127.0.0.1:8848
|
||||||
namespace: 07736b2e-9922-415e-8624-50b275be556e
|
namespace: 289db019-a290-4903-ac1a-5d341af8b272
|
||||||
|
# namespace: 07736b2e-9922-415e-8624-50b275be556e
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
group: DEFAULT_GROUP
|
group: DEFAULT_GROUP
|
||||||
|
|
@ -28,7 +29,8 @@ spring:
|
||||||
discovery:
|
discovery:
|
||||||
# nacos地址
|
# nacos地址
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 127.0.0.1:8848
|
||||||
namespace: 07736b2e-9922-415e-8624-50b275be556e
|
namespace: 289db019-a290-4903-ac1a-5d341af8b272
|
||||||
|
# namespace: 07736b2e-9922-415e-8624-50b275be556e
|
||||||
|
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
|
|
|
||||||
|
|
@ -232,7 +232,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.16.18</version>
|
<version>1.18.24</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.24</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.nacos</groupId>
|
<groupId>com.alibaba.nacos</groupId>
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<scope>provided</scope>
|
<version>1.18.24</version> <!-- 替换原1.16.18,仅支持JDK1.8 -->
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.16.18</version>
|
<version>1.18.24</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue