修改配置文件

This commit is contained in:
haozq 2025-12-04 10:01:26 +08:00
parent d9bba9eb20
commit b5ab4117e0
17 changed files with 507 additions and 153 deletions

View File

@ -4,40 +4,24 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="7985a41e-99ed-4d36-8f6a-131c69344f36" name="Changes" comment="修改gateway"> <list default="true" id="7985a41e-99ed-4d36-8f6a-131c69344f36" name="Changes" comment="修改配置文件">
<change afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-druid.yml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/controller/AllUserController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/hn-ldlz/ldlz-admin/src/main/resources/bootstrap-prod.yml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/controller/LoginController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/dao/AllUserDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/dao/LoginDao.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/service/AllUserService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/service/LoginService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/vo/AjaxResult.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/login/vo/LoginFormVo.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/mappers/login/AllUserMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/mappers/login/LoginMapper.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/java/com/bonus/hnrn/rnbmw/manager/config/BnsSecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/config/BnsSecurityConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HnRealNameBmw/src/main/resources/55application.properties" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/filter/TokenFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/filter/TokenFilter.java" 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$/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$/hn-gateway/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HnRealNameMw/src/main/resources/application.properties" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/java/com/bonus/gateway/filter/ValidateCodeFilter.java" 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-gateway/bonus-gateway/src/main/java/com/bonus/gateway/handler/ValidateCodeHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/hn-gateway/bonus-gateway/src/main/java/com/bonus/gateway/handler/ValidateCodeHandler.java" 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> </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" />
@ -47,6 +31,7 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="Interface" />
<option value="Class" /> <option value="Class" />
</list> </list>
</option> </option>
@ -54,67 +39,71 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectColorInfo"><![CDATA[{ <component name="ProjectColorInfo">{
"associatedIndex": 4 &quot;associatedIndex&quot;: 4
}]]></component> }</component>
<component name="ProjectId" id="36JXeDcNXtcmc8Es1XGriXfJbQu" /> <component name="ProjectId" id="36JXeDcNXtcmc8Es1XGriXfJbQu" />
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Maven.HnRealNameBmw [clean].executor": "Run", &quot;Maven.HnRealNameBmw [clean].executor&quot;: &quot;Run&quot;,
"Maven.HnRealNameBmw [install].executor": "Run", &quot;Maven.HnRealNameBmw [install].executor&quot;: &quot;Run&quot;,
"Maven.HnRealNameMmw [clean].executor": "Run", &quot;Maven.HnRealNameMmw [clean].executor&quot;: &quot;Run&quot;,
"Maven.HnRealNameMmw [install].executor": "Run", &quot;Maven.HnRealNameMmw [install].executor&quot;: &quot;Run&quot;,
"Maven.bonus-common [clean].executor": "Run", &quot;Maven.bonus-common [clean].executor&quot;: &quot;Run&quot;,
"Maven.hn-czl-service [clean].executor": "Run", &quot;Maven.hn-czl-service [clean].executor&quot;: &quot;Run&quot;,
"Maven.hn-czl-service [install].executor": "Run", &quot;Maven.hn-czl-service [install].executor&quot;: &quot;Run&quot;,
"Maven.hn-gateway [clean].executor": "Run", &quot;Maven.hn-gateway [clean].executor&quot;: &quot;Run&quot;,
"Maven.hn-gateway [install].executor": "Run", &quot;Maven.hn-gateway [install].executor&quot;: &quot;Run&quot;,
"Maven.hn-gateway [verify].executor": "Run", &quot;Maven.hn-gateway [verify].executor&quot;: &quot;Run&quot;,
"Maven.hn_czl_screen [clean].executor": "Run", &quot;Maven.hn_czl_screen [clean].executor&quot;: &quot;Run&quot;,
"Maven.hn_czl_screen [install].executor": "Run", &quot;Maven.hn_czl_screen [install].executor&quot;: &quot;Run&quot;,
"Maven.ldlz [clean].executor": "Run", &quot;Maven.ldlz [clean].executor&quot;: &quot;Run&quot;,
"Maven.ldlz [install].executor": "Run", &quot;Maven.ldlz [install].executor&quot;: &quot;Run&quot;,
"RequestMappingsPanelOrder0": "0", &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
"RequestMappingsPanelOrder1": "1", &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
"RequestMappingsPanelWidth0": "75", &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
"RequestMappingsPanelWidth1": "75", &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.git.unshallow": "true", &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
"SONARLINT_PRECOMMIT_ANALYSIS": "true", &quot;SONARLINT_PRECOMMIT_ANALYSIS&quot;: &quot;true&quot;,
"Spring Boot.BonusGatewayApplication.executor": "Run", &quot;Spring Boot.BonusGatewayApplication.executor&quot;: &quot;Debug&quot;,
"Spring Boot.CzlScreenApplication.executor": "Run", &quot;Spring Boot.CzlScreenApplication.executor&quot;: &quot;Run&quot;,
"Spring Boot.CzlServiceApplication.executor": "Run", &quot;Spring Boot.CzlServiceApplication.executor&quot;: &quot;Run&quot;,
"Spring Boot.HnRealNameBmwApplication.executor": "Run", &quot;Spring Boot.HnRealNameBmwApplication.executor&quot;: &quot;Debug&quot;,
"Spring Boot.LdlzApplication.executor": "Run", &quot;Spring Boot.LdlzApplication.executor&quot;: &quot;Run&quot;,
"Spring Boot.RnmwApplication.executor": "Debug", &quot;Spring Boot.RnmwApplication.executor&quot;: &quot;Debug&quot;,
"git-widget-placeholder": "main", &quot;git-widget-placeholder&quot;: &quot;main&quot;,
"kotlin-language-version-configured": "true", &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
"last_opened_file_path": "F:/workspace/idea/hn_cloud_service/hn-czl-service/src/main/resources", &quot;last_opened_file_path&quot;: &quot;F:/workspace/idea/hn_cloud_service/HnRealNameBmw/src/main/resources/mappers/login&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "npm", &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
"project.structure.last.edited": "Modules", &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
"project.structure.proportion": "0.0", &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
"project.structure.side.proportion": "0.0", &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
"run.configurations.included.in.services": "true", &quot;run.configurations.included.in.services&quot;: &quot;true&quot;,
"settings.editor.selected.configurable": "preferences.lookFeel", &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="F:\workspace\idea\hn_cloud_service\HnRealNameBmw\src\main\resources\mappers\login" />
<recent name="F:\workspace\idea\hn_cloud_service\hn-czl-service\src\main\resources" /> <recent name="F:\workspace\idea\hn_cloud_service\hn-czl-service\src\main\resources" />
<recent name="F:\workspace\idea\hn_cloud_service\hn-gateway" /> <recent name="F:\workspace\idea\hn_cloud_service\hn-gateway" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.bonus.hnrn.rnbmw.login.vo" />
</key>
</component> </component>
<component name="RunAnythingCache"> <component name="RunAnythingCache">
<option name="myCommands"> <option name="myCommands">
@ -132,7 +121,7 @@
</set> </set>
</option> </option>
</component> </component>
<component name="RunManager" selected="Spring Boot.CzlScreenApplication"> <component name="RunManager" selected="Spring Boot.HnRealNameBmwApplication">
<configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true"> <configuration name="BonusGatewayApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" 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" />
@ -207,7 +196,8 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1764725740407</updated> <updated>1764725740407</updated>
<workItem from="1764725741842" duration="9893000" /> <workItem from="1764725741842" duration="23784000" />
<workItem from="1764812788747" duration="877000" />
</task> </task>
<task id="LOCAL-00001" summary="修改"> <task id="LOCAL-00001" summary="修改">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -233,7 +223,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1764742057175</updated> <updated>1764742057175</updated>
</task> </task>
<option name="localTasksCounter" value="4" /> <task id="LOCAL-00004" summary="修改配置文件">
<option name="closed" value="true" />
<created>1764744907817</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1764744907817</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -304,7 +302,8 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="修改" /> <MESSAGE value="修改" />
<MESSAGE value="修改gateway" /> <MESSAGE value="修改gateway" />
<option name="LAST_COMMIT_MESSAGE" value="修改gateway" /> <MESSAGE value="修改配置文件" />
<option name="LAST_COMMIT_MESSAGE" value="修改配置文件" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -314,6 +313,11 @@
<line>35</line> <line>35</line>
<option name="timeStamp" value="1" /> <option name="timeStamp" value="1" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/HnRealNameBmw/src/main/java/com/bonus/hnrn/rnbmw/manager/config/SecurityHandlerConfig.java</url>
<line>96</line>
<option name="timeStamp" value="16" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>

View File

@ -0,0 +1,24 @@
package com.bonus.hnrn.rnbmw.login.controller;
import com.bonus.hnrn.rnbmw.login.service.AllUserService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "系统用户管理")
@RestController
@RequestMapping("allUser")
public class AllUserController {
@Autowired
private AllUserService allUserService;
}

View File

@ -0,0 +1,33 @@
package com.bonus.hnrn.rnbmw.login.controller;
import com.bonus.hnrn.rnbmw.login.service.LoginService;
import com.bonus.hnrn.rnbmw.login.vo.AjaxResult;
import com.bonus.hnrn.rnbmw.login.vo.LoginFormVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "用户登录")
@RestController
@RequestMapping("/allSystem/")
public class LoginController {
@Autowired
private LoginService loginService;
@PostMapping("login")
@ApiOperation(value = "系统登录")
public AjaxResult login(@RequestBody LoginFormVo bean) {
return loginService.login(bean);
}
}

View File

@ -0,0 +1,7 @@
package com.bonus.hnrn.rnbmw.login.dao;
import org.springframework.stereotype.Repository;
@Repository
public interface AllUserDao {
}

View File

@ -0,0 +1,15 @@
package com.bonus.hnrn.rnbmw.login.dao;
import com.bonus.hnrn.rnbmw.login.vo.LoginFormVo;
import org.springframework.stereotype.Repository;
@Repository
public interface LoginDao {
/**
* 查询用户账户号信息
* @param bean
* @return
*/
LoginFormVo getUserLogin(LoginFormVo bean);
}

View File

@ -0,0 +1,7 @@
package com.bonus.hnrn.rnbmw.login.service;
import org.springframework.stereotype.Service;
@Service
public class AllUserService {
}

View File

@ -0,0 +1,51 @@
package com.bonus.hnrn.rnbmw.login.service;
import com.bonus.hnrn.rnbmw.login.dao.LoginDao;
import com.bonus.hnrn.rnbmw.login.vo.AjaxResult;
import com.bonus.hnrn.rnbmw.login.vo.LoginFormVo;
import com.bonus.hnrn.rnbmw.manager.utils.AESCBCUtils;
import com.github.pagehelper.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@Slf4j
public class LoginService {
@Autowired
private LoginDao mapper;
/**
* 系统登录
* @param bean
* @return
*/
public AjaxResult login(LoginFormVo bean) {
try{
String username = AESCBCUtils.decrypt(bean.getUsername());
String password = AESCBCUtils.decrypt(bean.getPassword());
bean.setUsername(username);
bean.setPassword(password);
if(StringUtil.isEmpty(bean.getUsername() ) || StringUtil.isEmpty(bean.getPassword())) {
return AjaxResult.error("请输入账号及密码");
}
LoginFormVo loginFormVo = mapper.getUserLogin(bean);
if(loginFormVo == null) {
return AjaxResult.error("用户不存在");
}
return AjaxResult.success(loginFormVo);
}catch (Exception e){
log.error(e.toString(),e);
}
return AjaxResult.error("请输入正确的参数");
}
}

View File

@ -0,0 +1,207 @@
package com.bonus.hnrn.rnbmw.login.vo;
import com.bonus.hnrn.rnbmw.util.excel.StringUtils;
import java.util.HashMap;
import java.util.Objects;
/**
* 操作消息提醒
*
* @author czc
*/
public class AjaxResult extends HashMap<String, Object>
{
private static final long serialVersionUID = 1L;
/** 状态码 */
public static final String CODE_TAG = "code";
/** 返回内容 */
public static final String MSG_TAG = "msg";
/** 数据对象 */
public static final String DATA_TAG = "data";
/**
* 初始化一个新创建的 AjaxResult 对象使其表示一个空消息
*/
public AjaxResult()
{
}
/**
* 初始化一个新创建的 AjaxResult 对象
*
* @param code 状态码
* @param msg 返回内容
*/
public AjaxResult(int code, String msg)
{
super.put(CODE_TAG, code);
super.put(MSG_TAG, msg);
}
/**
* 初始化一个新创建的 AjaxResult 对象
*
* @param code 状态码
* @param msg 返回内容
* @param data 数据对象
*/
public AjaxResult(int code, String msg, Object data)
{
super.put(CODE_TAG, code);
super.put(MSG_TAG, msg);
if (StringUtils.isNotNull(data))
{
super.put(DATA_TAG, data);
}
}
/**
* 返回成功消息
*
* @return 成功消息
*/
public static AjaxResult success()
{
return AjaxResult.success("操作成功");
}
/**
* 返回成功数据
*
* @return 成功消息
*/
public static AjaxResult success(Object data)
{
return AjaxResult.success("操作成功", data);
}
/**
* 返回成功消息
*
* @param msg 返回内容
* @return 成功消息
*/
public static AjaxResult success(String msg)
{
return AjaxResult.success(msg, null);
}
/**
* 返回成功消息
*
* @param msg 返回内容
* @param data 数据对象
* @return 成功消息
*/
public static AjaxResult success(String msg, Object data)
{
return new AjaxResult(200, msg, data);
}
/**
* 返回警告消息
*
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult warn(String msg)
{
return AjaxResult.warn(msg, null);
}
/**
* 返回警告消息
*
* @param msg 返回内容
* @param data 数据对象
* @return 警告消息
*/
public static AjaxResult warn(String msg, Object data)
{
return new AjaxResult(601, msg, data);
}
/**
* 返回错误消息
*
* @return
*/
public static AjaxResult error()
{
return AjaxResult.error("操作失败");
}
/**
* 返回错误消息
*
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult error(String msg)
{
return AjaxResult.error(msg, null);
}
/**
* 返回错误消息
*
* @param msg 返回内容
* @param data 数据对象
* @return 警告消息
*/
public static AjaxResult error(String msg, Object data)
{
return new AjaxResult(500, msg, data);
}
/**
* 返回错误消息
*
* @param code 状态码
* @param msg 返回内容
* @return 警告消息
*/
public static AjaxResult error(int code, String msg)
{
return new AjaxResult(code, msg, null);
}
/**
* 是否为成功消息
*
* @return 结果
*/
public boolean isSuccess()
{
return Objects.equals(200, this.get(CODE_TAG));
}
/**
* 是否为错误消息
*
* @return 结果
*/
public boolean isError()
{
return !isSuccess();
}
/**
* 方便链式调用
*
* @param key
* @param value
* @return
*/
@Override
public AjaxResult put(String key, Object value)
{
super.put(key, value);
return this;
}
}

View File

@ -0,0 +1,29 @@
package com.bonus.hnrn.rnbmw.login.vo;
import lombok.Data;
@Data
public class LoginFormVo {
/**
* 主键
*/
private String id;
/**
* 用户名
*/
private String username;
/**
* 密码
*/
private String password;
/**
* 数据权限
*/
private String dataType;
/**
* 是否管理员
*/
private String isAdmin;
}

View File

@ -69,8 +69,9 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter {
http.authorizeRequests() http.authorizeRequests()
.antMatchers("/", "/gzRealName/**","/attendance/**","/*.html", "/favicon.ico", "/css/**", "/js/**", "/fonts/**", "/layui/**", "/layui-v2.9.2/**","/layui2.3.6/**", "/layer-v3.1.0/**","/img/**", .antMatchers("/", "/gzRealName/**","/attendance/**","/*.html", "/favicon.ico", "/css/**", "/js/**", "/fonts/**", "/layui/**", "/layui-v2.9.2/**","/layui2.3.6/**", "/layer-v3.1.0/**","/img/**",
"/v2/api-docs/**", "/swagger-resources/**", "/webjars/**", "/pages/**", "/druid/**","/interface/**", "/v2/api-docs/**", "/swagger-resources/**", "/webjars/**", "/pages/**", "/druid/**","/interface/**",
"/statics/**","/download/**","/register/**","/companyManager/resetUserPwd","/getCode/**","/OwnContract/updateDownloadState") "/statics/**","/download/**","/allSystem/login","/realname/allSystem/login","/register/**","/companyManager/resetUserPwd","/getCode/**","/OwnContract/updateDownloadState")
.permitAll().anyRequest().authenticated(); .permitAll().
anyRequest().authenticated();
http.formLogin().loginProcessingUrl("/login") http.formLogin().loginProcessingUrl("/login")
.successHandler(authenticationSuccessHandler).failureHandler(authenticationFailureHandler).and() .successHandler(authenticationSuccessHandler).failureHandler(authenticationFailureHandler).and()
.addFilterBefore(new VerifyFilter(redisTemplate,prefix,authenticationFailureHandler), UsernamePasswordAuthenticationFilter.class) .addFilterBefore(new VerifyFilter(redisTemplate,prefix,authenticationFailureHandler), UsernamePasswordAuthenticationFilter.class)
@ -84,47 +85,7 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter {
http.addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class); http.addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class);
} }
// @Override
// protected void configure(HttpSecurity http) throws Exception {
// // 添加安全过滤器在认证前执行 -- 防御 sql 注入攻击 xss 攻击
// http.addFilterBefore(new SecurityFilter(), BasicAuthenticationFilter.class);
// http.csrf().disable();
//
// // 使用新的跨域配置
// //http.cors(cors -> cors.configurationSource(corsConfigurationSource));
//
// // 基于token所以不需要session
// http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
//
// http.authorizeRequests()
// .antMatchers("/", "/gzRealName/**","/attendance/**","/*.html", "/favicon.ico", "/css/**", "/js/**", "/fonts/**", "/layui/**", "/layui-v2.9.2/**","/layui2.3.6/**", "/layer-v3.1.0/**","/img/**",
// "/v2/api-docs/**", "/swagger-resources/**", "/webjars/**", "/pages/**", "/druid/**","/interface/**",
// "/statics/**","/download/**","/register/**","/companyManager/resetUserPwd","/getCode/**","/OwnContract/updateDownloadState")
// .permitAll().anyRequest().authenticated();
// http.formLogin().loginProcessingUrl("/login")
// .successHandler(authenticationSuccessHandler).failureHandler(authenticationFailureHandler).and()
// .addFilterBefore(new VerifyFilter(redisTemplate,prefix,authenticationFailureHandler), UsernamePasswordAuthenticationFilter.class)
// .exceptionHandling().authenticationEntryPoint(authenticationEntryPoint);
// http.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
//
// // 添加CSP配置 - 在这里添加
// http.headers()
// .contentSecurityPolicy("default-src 'self'; " +
// "script-src 'self' https://trusted.cdn.com 'unsafe-inline' 'unsafe-eval'; " +
// "style-src 'self' 'unsafe-inline'; " +
// "img-src 'self' data: https://trusted.image.com; " +
// "font-src 'self'; " +
// "object-src 'none'; " +
// "base-uri 'self'; " +
// "form-action 'self';") // 添加form-action限制
// .and()
// .frameOptions().sameOrigin() // 改用sameOrigin提高安全性
// .cacheControl();
//
// // 注意上面的 .frameOptions().disable() 可能会降低安全性考虑使用 .sameOrigin() 替代
//
// http.addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class);
// }
@Override @Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception { protected void configure(AuthenticationManagerBuilder auth) throws Exception {

View File

@ -35,7 +35,13 @@ public class TokenFilter extends OncePerRequestFilter {
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException { throws ServletException, IOException {
String URL=request.getRequestURI(); String URL=request.getRequestURI();
System.err.println(URL);
// 排除无需Token的接口
if (URL.contains("/allSystem/login")) {
filterChain.doFilter(request, response);
return;
}
String token = getToken(request); String token = getToken(request);
if (StringUtils.isNotBlank(token)) { if (StringUtils.isNotBlank(token)) {
LoginUser loginUser = tokenService.getLoginUser(token); LoginUser loginUser = tokenService.getLoginUser(token);

View File

@ -63,10 +63,5 @@ oss:
accessKeySecret: jXewIIKO0ZmuuQedpN728M7bMFTNBO accessKeySecret: jXewIIKO0ZmuuQedpN728M7bMFTNBO
bucketName: lsun bucketName: lsun
cors:
allowed-origins: http://localhost:19118,http://127.0.0.1:19118,http://192.168.0.14:19118,http://116.63.172.211:1918
allowed-methods: GET,POST,PUT,DELETE,OPTIONS
allowed-headers: Content-Type,X-Requested-With,Token,Authorization,X-Custom-Header
allow-credentials: true
max-age: 3600

View File

@ -0,0 +1,9 @@
<?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.bonus.hnrn.rnbmw.login.dao.AllUserDao">
</mapper>

View File

@ -0,0 +1,19 @@
<?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.bonus.hnrn.rnbmw.login.dao.LoginDao">
<select id="getUserLogin" resultType="com.bonus.hnrn.rnbmw.login.vo.LoginFormVo">
select id,
user_name username,
password password,
data_type dataType,
create_time,
update_time,
is_admin isAdmin
FROM all_system_user
where user_name=#{username}
</select>
</mapper>

View File

@ -73,23 +73,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) { if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) {
return unauthorizedResponse(exchange, "令牌验证失败"); return unauthorizedResponse(exchange, "令牌验证失败");
} }
/* try {
String userName = JwtUtils.getUserName(claims);
String userId = JwtUtils.getUserId(claims);
String name = redisService.getCacheObject(userName + ":" + token);
String id = redisService.getCacheObject(userId + ":" + token);
*//* if (StringUtils.isEmpty(name) || !name.equals(userName)) {
return unauthorizedResponse(exchange, "令牌已过期或验证不正确!");
}
if (StringUtils.isEmpty(id) || !id.equals(userId)) {
return unauthorizedResponse(exchange, "令牌已过期或验证不正确!");
}*//*
*//* redisService.setCacheObject(userName + ":" + token, userName, 120L, TimeUnit.MINUTES);
redisService.setCacheObject(userId + ":" + token, userId + "", 120L, TimeUnit.MINUTES);*//*
} catch (Exception e) {
return unauthorizedResponse(exchange, "令牌已过期或验证不正确!");
}*/
// 设置用户信息到请求 // 设置用户信息到请求
addHeader(mutate, SecurityConstants.USER_KEY, userkey); addHeader(mutate, SecurityConstants.USER_KEY, userkey);
addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid); addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid);

View File

@ -7,6 +7,7 @@ import com.bonus.common.core.utils.ServletUtils;
import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.StringUtils;
import com.bonus.gateway.config.properties.CaptchaProperties; import com.bonus.gateway.config.properties.CaptchaProperties;
import com.bonus.gateway.service.ValidateCodeService; import com.bonus.gateway.service.ValidateCodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilter;
import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
@ -26,8 +27,9 @@ import java.util.concurrent.atomic.AtomicReference;
* @author bonus * @author bonus
*/ */
@Component @Component
@Slf4j
public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> { public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register", "/auth/getPhoneCode"}; private final static String[] VALIDATE_URL = new String[]{"/realname/allSystem/login", "/auth/register", "/auth/getPhoneCode"};
@Autowired @Autowired
private ValidateCodeService validateCodeService; private ValidateCodeService validateCodeService;
@ -62,6 +64,7 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID)); validateCodeService.checkCaptcha(obj.getString(CODE), obj.getString(UUID));
} catch (Exception e) { } catch (Exception e) {
log.error(e.toString(), e);
return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage()); return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage());
} }
return chain.filter(exchange); return chain.filter(exchange);

View File

@ -36,7 +36,7 @@ public class ValidateCodeHandler implements HandlerFunction<ServerResponse>
{ {
return Mono.error(e); return Mono.error(e);
} }
// return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromValue(ajax)); return ServerResponse.status(HttpStatus.OK).body(BodyInserters.fromObject(ajax));
return ServerResponse.status(HttpStatus.OK).body(null); // return ServerResponse.status(HttpStatus.OK).body(null);
} }
} }