From dec8f9668642c15cead18e6609a4d3441a6765c0 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Mon, 30 Aug 2021 09:24:41 +0800
Subject: [PATCH] UPDATE

---
 dsSso/接入示例/JavaDemo/.idea/misc.xml    |   2 +-
 .../接入示例/JavaDemo/.idea/workspace.xml |  25 +++++++++++++++---
 .../com/demo/index/IndexController.class      | Bin 3133 -> 3134 bytes
 .../java/com/demo/index/IndexController.java  |   2 +-
 dsSzxy/.idea/workspace.xml                    |   7 +++--
 .../ImRelateController/ImRelateController.go  |   6 ++---
 .../MinIORelateController.go                  |   2 +-
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/dsSso/接入示例/JavaDemo/.idea/misc.xml b/dsSso/接入示例/JavaDemo/.idea/misc.xml
index 4b661a5f..e934fbea 100644
--- a/dsSso/接入示例/JavaDemo/.idea/misc.xml
+++ b/dsSso/接入示例/JavaDemo/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="Java" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/dsSso/接入示例/JavaDemo/.idea/workspace.xml b/dsSso/接入示例/JavaDemo/.idea/workspace.xml
index 66d4f43c..66839298 100644
--- a/dsSso/接入示例/JavaDemo/.idea/workspace.xml
+++ b/dsSso/接入示例/JavaDemo/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e8f146ac-f507-4bd7-9ea5-679097c20d1c" name="Default Changelist" comment="" />
+    <list default="true" id="e8f146ac-f507-4bd7-9ea5-679097c20d1c" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Target/classes/com/demo/index/IndexController.class" beforeDir="false" afterPath="$PROJECT_DIR$/Target/classes/com/demo/index/IndexController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/demo/index/IndexController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../dsSzxy/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../../dsSzxy/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/../../../dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -106,12 +113,17 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.notifications" />
   </component>
   <component name="RunManager">
     <configuration name="Start" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
       <option name="MAIN_CLASS_NAME" value="com.demo.Start" />
-      <module name="jfinal_demo_for_maven" />
+      <module name="JavaDemo" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -139,6 +151,9 @@
       <workItem from="1615347415032" duration="8000" />
       <workItem from="1619600842667" duration="3844000" />
       <workItem from="1620778073455" duration="130000" />
+      <workItem from="1629870151612" duration="366000" />
+      <workItem from="1629870535555" duration="752000" />
+      <workItem from="1629872038096" duration="96000" />
     </task>
     <servers />
   </component>
@@ -205,6 +220,10 @@
       </breakpoints>
     </breakpoint-manager>
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/demo/elasticsearch/elasticsearchController.java">
       <provider selected="true" editor-type-id="text-editor">
diff --git a/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class b/dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class
index cf778b406005224a579f8ecdf10feaa815269c59..fa2c0f92ef85552258671bbe17f941b0d11c517a 100644
GIT binary patch
delta 19
acmdlhu}@-y8Z(<nMoCFQ@n&siAx;26eg)0|

delta 18
Zcmdldu~%Y)8Z)bKMoCG*W*ufBP5?Sy1zG?A

diff --git a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
index c746e2e5..36ac5f80 100644
--- a/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
+++ b/dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java
@@ -10,7 +10,7 @@ import java.util.Base64;
 
 public class IndexController extends Controller {
     //服务器的位置信息
-    String OAuth2Server = "http://www.ccsjy.cn";
+    String OAuth2Server = "https://www.ccsjy.cn";
     String authCodeURI = OAuth2Server + "/oauth2/authorize";
     String authTokenURI = OAuth2Server + "/oauth2/access_token";
 
diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index 35dcbd14..9240bdad 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -2,9 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class" beforeDir="false" afterPath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/Target/classes/com/demo/index/IndexController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../dsSso/接入示例/JavaDemo/src/main/java/com/demo/index/IndexController.java" 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/ImRelateController/ImRelateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -42,7 +45,7 @@
     <property name="go.import.settings.migrated" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
     <property name="go.tried.to.enable.integration.vgo.integrator" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../dsBaseWeb" />
+    <property name="last_opened_file_path" value="H:/Go_Test/Test03" />
     <property name="settings.editor.selected.configurable" value="preferences.keymap" />
   </component>
   <component name="RecentsManager">
diff --git a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
index 8881f85f..2714faf9 100644
--- a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
+++ b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
@@ -145,10 +145,10 @@ func saveChatRecord(c *gin.Context) {
 日期：2021-08-23
 */
 func GetPersonAvatar(c *gin.Context) {
-	personAvatar := make([]map[string]string, 0)
+	var personAvatar []map[string]string
 	personIds := c.PostForm("personIds")
-	personId := strings.Split(personIds, ",")
-	for _, val := range personId {
+	personIdArr := strings.Split(personIds, ",")
+	for _, val := range personIdArr {
 		id := val + "_5"
 		avatar := ImRelateDao.GetPersonAvatarByUserId(id)
 		myMap := map[string]string{val: avatar}
diff --git a/dsSzxy/Business/MinIORelate/MinIORelateController/MinIORelateController.go b/dsSzxy/Business/MinIORelate/MinIORelateController/MinIORelateController.go
index de2a1916..7fa62c3e 100644
--- a/dsSzxy/Business/MinIORelate/MinIORelateController/MinIORelateController.go
+++ b/dsSzxy/Business/MinIORelate/MinIORelateController/MinIORelateController.go
@@ -18,7 +18,7 @@ import (
 	"time"
 )
 
-//模块的路由配置
+//模块的路由配置1
 func Routers(r *gin.RouterGroup) {
 	rr := r.Group("/minioRelate")