Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -231,7 +231,11 @@ public class AppPermissionService {
                     userLogin.setId(userid);
                     userLogin.setImPassword(imPassword);
                     userLogin.setImUserid(imUserId);
+                    userLogin.setUsername(username);
+                    appUserLoginBiz.updateSelectiveById(userLogin);
                 }
+                data.put("im_token",access_token);
+                data.put("im_UserId",imUserId);
             }
 
             if (data != null) {
@@ -349,6 +353,14 @@ public class AppPermissionService {
                     }
                     // 登录结果要做做统一处理
                     JSONObject data = autoLogin(userid, username, headimgurl, nickname);
+                    // 到im注册，获取返回结果
+                    Integer  imUserId=userLogin.getImUserid();
+                    String imPassword=userLogin.getImPassword();
+                    if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
+                        String  access_token=loginIm(username,imPassword,imUserId);
+                        data.put("im_token",access_token);
+                        data.put("im_UserId",imUserId);
+                    }
                     if (data != null) {
                         return JsonResultUtil.createSuccessResultWithObj(data);
                     }
@@ -428,6 +440,14 @@ public class AppPermissionService {
             nickname = userDetail.getNickname();
         }
         JSONObject data = autoLogin(userid, userLogin.getUsername(), headimgurl, nickname);
+        // 到im注册，获取返回结果
+        Integer  imUserId=userLogin.getImUserid();
+        String imPassword=userLogin.getImPassword();
+        if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
+            String  access_token=loginIm(userLogin.getUsername(),imPassword,imUserId);
+            data.put("im_token",access_token);
+            data.put("im_UserId",imUserId);
+        }
         if (data != null) {
             return JsonResultUtil.createSuccessResultWithObj(data);
         }
@@ -462,6 +482,14 @@ public class AppPermissionService {
             Integer userid = user.getId();
             String nickname = SystemConfig.USER_NIKENAME_DEFAULT + (int) ((Math.random() * 9 + 1) * 100000);
             JSONObject data = autoLogin(userid, user.getUsername(), SystemConfig.USER_HEADER_URL_DEFAULT, nickname);
+            // 到im注册，获取返回结果
+            Integer  imUserId=user.getImUserid();
+            String imPassword=user.getImPassword();
+            if(StringUtils.isNotBlank(imPassword)&&imUserId!=null&&imUserId>0){
+                String  access_token=loginIm(username,imPassword,imUserId);
+                data.put("im_token",access_token);
+                data.put("im_UserId",imUserId);
+            }
             if (data != null) {
                 return JsonResultUtil.createSuccessResultWithObj(data);
             }
@@ -571,7 +599,7 @@ public class AppPermissionService {
 
     //登录im
 
-    public String loginIm(String username, String password, String userId) {
+    public String loginIm(String username, String password, Integer userId) {
         log.error("------登录loginIm----username====="+username+"-----password==="+password+"---userId==="+userId);
         Map<String, Object> map = new HashMap<>();
         map.put("telephone", username);

xx-im/xx-im-server/pom.xml

@@ -109,5 +109,20 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/ImApplication.java

@@ -4,12 +4,13 @@ import com.ace.cache.EnableAceCache;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient