@ -1,15 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<project version= "4" >
<project version= "4" >
<component name= "ChangeListManager" >
<component name= "ChangeListManager" >
< < < < < < < HEAD
<list default= "true" id= "7dd5aa4b-bd93-4c30-b8e6-5ee159290869" name= "Changes" comment= "commit" >
<change beforePath= "$PROJECT_DIR$/.idea/workspace.xml" beforeDir= "false" afterPath= "$PROJECT_DIR$/.idea/workspace.xml" afterDir= "false" />
=======
<list default= "true" id= "19c8c37d-a056-451c-a29d-fb612b9a3e2f" name= "Default Changelist" comment= "" >
<list default= "true" id= "19c8c37d-a056-451c-a29d-fb612b9a3e2f" name= "Default Changelist" comment= "" >
<change beforePath= "$PROJECT_DIR$/../dsBaseRpc/Linux上安装Go环境+配置DLV.txt" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsBaseRpc/Linux上安装Go环境+配置DLV.txt" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsBaseRpc/RpcService/BaseTeacher/BaseTeacherService/BaseTeacherService.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsBaseRpc/RpcService/SysLoginperson/SysLoginpersonDao/SysLoginpersonDao.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsBaseRpc/Utils/DbUtil/DbUtil.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsBaseRpc/Utils/DbUtil/DbUtil.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsBaseRpc/Utils/RedisUtil/RedisUtil.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsBaseRpc/Utils/RedisUtil/RedisUtil.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsSso/Controller/ControllerOauth2/ControllerOauth2.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsSso/Controller/ControllerOauth2/ControllerOauth2.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsSupport/Html/占位.txt" beforeDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsSupport/go.mod" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsSupport/go.mod" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/../dsSupport/go.sum" beforeDir= "false" afterPath= "$PROJECT_DIR$/../dsSupport/go.sum" 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$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/go.mod" beforeDir= "false" afterPath= "$PROJECT_DIR$/go.mod" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" beforeDir= "false" afterPath= "$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" afterDir= "false" />
<change beforePath= "$PROJECT_DIR$/go.sum" beforeDir= "false" afterPath= "$PROJECT_DIR$/go.sum" afterDir= "false" />
>>>>>>> origin/master
</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" />
@ -30,6 +34,9 @@
<component name= "GoLibraries" >
<component name= "GoLibraries" >
<option name= "indexEntireGoPath" value= "false" />
<option name= "indexEntireGoPath" value= "false" />
</component>
</component>
<component name= "ProblemsViewState" >
<option name= "selectedIndex" value= "1" />
</component>
<component name= "ProjectId" id= "1wHqoZ4Mc0xnzUNKevge8S7NouM" />
<component name= "ProjectId" id= "1wHqoZ4Mc0xnzUNKevge8S7NouM" />
<component name= "ProjectLevelVcsManager" >
<component name= "ProjectLevelVcsManager" >
<ConfirmationsSetting value= "1" id= "Add" />
<ConfirmationsSetting value= "1" id= "Add" />
@ -47,18 +54,9 @@
<property name= "go.import.settings.migrated" value= "true" />
<property name= "go.import.settings.migrated" value= "true" />
<property name= "go.sdk.automatically.set" value= "true" />
<property name= "go.sdk.automatically.set" value= "true" />
<property name= "go.tried.to.enable.integration.vgo.integrator" value= "true" />
<property name= "go.tried.to.enable.integration.vgo.integrator" value= "true" />
<property name= "last_opened_file_path" value= " H:/Go_Test/Test03 " />
<property name= "last_opened_file_path" value= " $PROJECT_DIR$ " />
<property name= "settings.editor.selected.configurable" value= "preferences.keymap" />
<property name= "settings.editor.selected.configurable" value= "preferences.keymap" />
</component>
</component>
< < < < < < < HEAD
<component name= "RunManager" >
<configuration default= "true" type= "GoApplicationRunConfiguration" factoryName= "Go Application" >
<module name= "dsSzxy" />
<working_directory value= "$PROJECT_DIR$" />
<kind value= "FILE" />
<directory value= "$PROJECT_DIR$" />
<filePath value= "$PROJECT_DIR$" />
=======
<component name= "RecentsManager" >
<component name= "RecentsManager" >
<key name= "CopyFile.RECENT_KEYS" >
<key name= "CopyFile.RECENT_KEYS" >
<recent name= "E:\Work\dsMin\dsSzxy\Utils" />
<recent name= "E:\Work\dsMin\dsSzxy\Utils" />
@ -73,7 +71,6 @@
<filePath value= "$PROJECT_DIR$/Tools/XltraSwag.go" />
<filePath value= "$PROJECT_DIR$/Tools/XltraSwag.go" />
<package value= "dsSzxy" />
<package value= "dsSzxy" />
<directory value= "$PROJECT_DIR$" />
<directory value= "$PROJECT_DIR$" />
>>>>>>> origin/master
<method v= "2" />
<method v= "2" />
</configuration>
</configuration>
<configuration name= "go build dsSzxy" type= "GoApplicationRunConfiguration" factoryName= "Go Application" temporary= "true" nameIsGenerated= "true" >
<configuration name= "go build dsSzxy" type= "GoApplicationRunConfiguration" factoryName= "Go Application" temporary= "true" nameIsGenerated= "true" >
@ -94,15 +91,6 @@
<directory value= "$PROJECT_DIR$" />
<directory value= "$PROJECT_DIR$" />
<method v= "2" />
<method v= "2" />
</configuration>
</configuration>
<configuration default= "true" type= "GoTestRunConfiguration" factoryName= "Go Test" >
<module name= "dsSzxy" />
<working_directory value= "$PROJECT_DIR$" />
<kind value= "DIRECTORY" />
<directory value= "$PROJECT_DIR$" />
<filePath value= "$PROJECT_DIR$" />
<framework value= "gotest" />
<method v= "2" />
</configuration>
<recent_temporary >
<recent_temporary >
<list >
<list >
<item itemvalue= "Go Build.go build main.go" />
<item itemvalue= "Go Build.go build main.go" />
@ -127,13 +115,6 @@
</option>
</option>
<option name= "oldMeFiltersMigrated" value= "true" />
<option name= "oldMeFiltersMigrated" value= "true" />
</component>
</component>
< < < < < < < HEAD
<component name= "VcsManagerConfiguration" >
<MESSAGE value= "commit" />
<option name= "LAST_COMMIT_MESSAGE" value= "commit" />
</component>
=======
>>>>>>> origin/master
<component name= "VgoProject" >
<component name= "VgoProject" >
<integration-enabled > true</integration-enabled>
<integration-enabled > true</integration-enabled>
<environment >
<environment >
@ -142,4 +123,15 @@
</map>
</map>
</environment>
</environment>
</component>
</component>
<component name= "XDebuggerManager" >
<breakpoint-manager >
<breakpoints >
<line-breakpoint enabled= "true" type= "DlvLineBreakpoint" >
<url > file://$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go</url>
<line > 2</line>
<option name= "timeStamp" value= "1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>
</project>