UPDATE
continuous-integration/drone/push Build is passing Details

master
kgdxpr 4 years ago
parent 417c13d49e
commit dec8f96686

@ -8,7 +8,7 @@
</list> </list>
</option> </option>
</component> </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" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

@ -4,7 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <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="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -106,12 +113,17 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <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_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <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>
<component name="RunManager"> <component name="RunManager">
<configuration name="Start" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <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" /> <option name="MAIN_CLASS_NAME" value="com.demo.Start" />
<module name="jfinal_demo_for_maven" /> <module name="JavaDemo" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
@ -139,6 +151,9 @@
<workItem from="1615347415032" duration="8000" /> <workItem from="1615347415032" duration="8000" />
<workItem from="1619600842667" duration="3844000" /> <workItem from="1619600842667" duration="3844000" />
<workItem from="1620778073455" duration="130000" /> <workItem from="1620778073455" duration="130000" />
<workItem from="1629870151612" duration="366000" />
<workItem from="1629870535555" duration="752000" />
<workItem from="1629872038096" duration="96000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -205,6 +220,10 @@
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/main/java/com/demo/elasticsearch/elasticsearchController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/com/demo/elasticsearch/elasticsearchController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">

@ -10,7 +10,7 @@ import java.util.Base64;
public class IndexController extends Controller { public class IndexController extends Controller {
//服务器的位置信息 //服务器的位置信息
String OAuth2Server = "http://www.ccsjy.cn"; String OAuth2Server = "https://www.ccsjy.cn";
String authCodeURI = OAuth2Server + "/oauth2/authorize"; String authCodeURI = OAuth2Server + "/oauth2/authorize";
String authTokenURI = OAuth2Server + "/oauth2/access_token"; String authTokenURI = OAuth2Server + "/oauth2/access_token";

@ -2,9 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<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$/../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$/.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/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> </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" />
@ -42,7 +45,7 @@
<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="$PROJECT_DIR$/../dsBaseWeb" /> <property name="last_opened_file_path" value="H:/Go_Test/Test03" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" /> <property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">

@ -145,10 +145,10 @@ func saveChatRecord(c *gin.Context) {
2021-08-23 2021-08-23
*/ */
func GetPersonAvatar(c *gin.Context) { func GetPersonAvatar(c *gin.Context) {
personAvatar := make([]map[string]string, 0) var personAvatar []map[string]string
personIds := c.PostForm("personIds") personIds := c.PostForm("personIds")
personId := strings.Split(personIds, ",") personIdArr := strings.Split(personIds, ",")
for _, val := range personId { for _, val := range personIdArr {
id := val + "_5" id := val + "_5"
avatar := ImRelateDao.GetPersonAvatarByUserId(id) avatar := ImRelateDao.GetPersonAvatarByUserId(id)
myMap := map[string]string{val: avatar} myMap := map[string]string{val: avatar}

@ -18,7 +18,7 @@ import (
"time" "time"
) )
//模块的路由配置 //模块的路由配置1
func Routers(r *gin.RouterGroup) { func Routers(r *gin.RouterGroup) {
rr := r.Group("/minioRelate") rr := r.Group("/minioRelate")

Loading…
Cancel
Save