add easemob app server module

FuDongHai · FuDongHai · commit dcf4250d5847 · 2023-04-21T11:24:33.000+08:00
diff --git a/agora-app-server/src/main/java/com/easemob/agora/api/TokenController.java b/agora-app-server/src/main/java/com/easemob/agora/api/TokenController.java
@@ -1,6 +1,7 @@
 package com.easemob.agora.api;
 
 import com.alibaba.fastjson.JSONObject;
+import com.easemob.agora.model.ResCode;
 import com.easemob.agora.model.ResponseParam;
 import com.easemob.agora.model.TokenInfo;
 import com.easemob.agora.service.RedisService;
@@ -29,6 +30,28 @@ public TokenController(TokenService tokenService) {
         this.tokenService = tokenService;
     }
 
+    @GetMapping("/token/rtc/channel/{channelName}/agorauid/{agoraUid}")
+    public ResponseParam getAgoraRtcToken(@PathVariable String channelName,
+            @PathVariable Integer agoraUid,
+            @RequestParam("userAccount") String userAccount) {
+
+        redisService.saveAgoraChannelInfo(false, channelName, String.valueOf(agoraUid));
+        redisService.saveUidMapper(String.valueOf(agoraUid), userAccount);
+
+        ResponseParam responseParam = new ResponseParam();
+        if (!StringUtils.isEmpty(channelName) && agoraUid != null) {
+            TokenInfo token = tokenService.getRtcToken(channelName, agoraUid);
+            responseParam.setAccessToken(token.getToken());
+            responseParam.setExpireTime(token.getExpireTime());
+
+        } else {
+            responseParam.setCode(ResCode.RES_REQUEST_PARAM_ERROR);
+            responseParam.setErrorInfo("channelName or agoraUid is not null");
+        }
+
+        return responseParam;
+    }
+
     @PostMapping("/token/rtcToken")
     public ResponseParam getAgoraToken(
             @RequestParam(name = "channelName", required = false) String channelName,
diff --git a/agora-app-server/src/main/java/com/easemob/agora/model/ResCode.java b/agora-app-server/src/main/java/com/easemob/agora/model/ResCode.java
@@ -7,6 +7,7 @@
  **/
 public enum ResCode {
     RES_0K(200),//可以成功返回
+    RES_REQUEST_PARAM_ERROR(400),//请求参数错误
     RES_METHOND_ERROR(411), //请求方法错误
     RES_PARME_ERROR(412),//请求参数错误
     RES_CONTENT_TYPE_ERROR(413), //传参类型错误
diff --git a/agora-app-server/src/main/resources/application.properties b/agora-app-server/src/main/resources/application.properties
@@ -5,23 +5,23 @@ spring.application.name=agora-app-server
 ## 环信console 获取自己的rest域名
 application.restServer=a1.easemob.com/
 ## 环信console 注册获取的orgname
-application.orgName=easemob-demo
+application.orgName=xxx
 ## 环信console 注册获取的appname
-application.appName=chatdemoui
+application.appName=xxx
 ## 声网console获取appid
-application.agoraAppId=XXX
+application.agoraAppId=xxx
 ## 声网console获取appcert
-application.agoraCert=XXX
+application.agoraCert=xxx
 
 management.endpoints.web.base-path=/management
 management.endpoints.web.exposure.include=*
 
 spring.cloud.consul.enabled=false
 
 ## 本地redis
-spring.redis.channel.host=localhost
-spring.redis.channel.port=6379
-spring.redis.channel.password=123456
-spring.redis.channel.timeout=10000
+spring.redis.channel.nodes=tcp://localhost:6379
+spring.redis.channel.password=
+spring.redis.channel.type=standalone
+spring.redis.channel.ssl=false
 
 spring.redis.channel.expireTime=86400
diff --git a/easemob-app-server/src/main/java/com/easemob/app/api/AppUserController.java b/easemob-app-server/src/main/java/com/easemob/app/api/AppUserController.java
@@ -3,7 +3,6 @@
 import com.easemob.app.exception.ASUnAuthorizedException;
 import com.easemob.app.model.*;
 import com.easemob.app.service.AppUserService;
-import com.easemob.app.service.IndexTestService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/easemob-app-server/src/main/java/com/easemob/app/api/TokenController.java b/easemob-app-server/src/main/java/com/easemob/app/api/TokenController.java
@@ -28,7 +28,6 @@ public TokenController(TokenService tokenService) {
         this.tokenService = tokenService;
     }
 
-    // to do 考虑server sdk提供直接生成rtc token的方法
     @GetMapping("/token/rtc/channel/{channelName}/agorauid/{agoraUid}")
     public ResponseEntity getAgoraRtcToken(@PathVariable String channelName,
             @PathVariable Integer agoraUid,
diff --git a/easemob-app-server/src/main/java/com/easemob/app/model/IndexTest.java b/easemob-app-server/src/main/java/com/easemob/app/model/IndexTest.java
diff --git a/easemob-app-server/src/main/java/com/easemob/app/model/IndexTestRepository.java b/easemob-app-server/src/main/java/com/easemob/app/model/IndexTestRepository.java
diff --git a/easemob-app-server/src/main/java/com/easemob/app/service/IndexTestService.java b/easemob-app-server/src/main/java/com/easemob/app/service/IndexTestService.java
diff --git a/easemob-app-server/src/main/java/com/easemob/app/service/RestService.java b/easemob-app-server/src/main/java/com/easemob/app/service/RestService.java
@@ -24,4 +24,8 @@ public interface RestService {
      */
     String getChatUserUuid(String appkey, String chatUserName);
 
+    void sendTextMessageToUser(String from, String to, String messageContent);
+
+    void sendCmdMessageToUser(String from, String to, String action);
+
 }
diff --git a/easemob-app-server/src/main/java/com/easemob/app/service/impl/RestServiceImpl.java b/easemob-app-server/src/main/java/com/easemob/app/service/impl/RestServiceImpl.java
@@ -21,6 +21,9 @@ public class RestServiceImpl implements RestService {
     @Value("${application.baseUri}")
     private String baseUri;
 
+    @Value("${application.appkey}")
+    private String appkey;
+
     @Autowired
     private Rest2Properties rest2Properties;
 
@@ -100,4 +103,67 @@ public class RestServiceImpl implements RestService {
         List<Map<String, Object>> results = (List<Map<String, Object>>) responseEntity.getBody().get("entities");
         return (String) results.get(0).get("uuid");
     }
+
+    @Override public void sendTextMessageToUser(String from, String to, String messageContent) {
+
+        String orgName = appkey.split("#")[0];
+        String appName = appkey.split("#")[1];
+        String url = baseUri + "/" + orgName + "/" + appName + "/messages/users";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(Objects.requireNonNull(RestUtil.getToken(appkey, restTemplate, rest2Properties)));
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("from", from);
+        List<String> tos = new ArrayList<>();
+        tos.add(to);
+        body.put("to", tos);
+        body.put("type", "txt");
+        Map<String, String> messageBody = new HashMap<>();
+        messageBody.put("msg", messageContent);
+        body.put("body", messageBody);
+
+        HttpEntity<Map<String, Object>> entity = new HttpEntity<>(body, headers);
+
+        try {
+            restTemplate.exchange(url, HttpMethod.POST, entity, Map.class);
+        } catch (Exception e) {
+            log.error("send message to user. chatUserName : {}, error : {}", to, e.getMessage());
+            throw new RestClientException("Send message to user error.");
+        }
+    }
+
+    @Override public void sendCmdMessageToUser(String from, String to, String action) {
+
+        String orgName = appkey.split("#")[0];
+        String appName = appkey.split("#")[1];
+        String url = baseUri + "/" + orgName + "/" + appName + "/messages/users";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(Objects.requireNonNull(RestUtil.getToken(appkey, restTemplate, rest2Properties)));
+
+        Map<String, Object> body = new HashMap<>();
+        body.put("from", from);
+        List<String> tos = new ArrayList<>();
+        tos.add(to);
+        body.put("to", tos);
+        body.put("type", "cmd");
+        body.put("routetype", "ROUTE_ONLINE");
+        Map<String, String> messageBody = new HashMap<>();
+        messageBody.put("action", action);
+        body.put("body", messageBody);
+
+        HttpEntity<Map<String, Object>> entity = new HttpEntity<>(body, headers);
+
+        try {
+            restTemplate.exchange(url, HttpMethod.POST, entity, Map.class);
+        } catch (Exception e) {
+            log.error("send cmd message to user. chatUserName : {}, error : {}", to, e.getMessage());
+            throw new RestClientException("Send cmd message to user error.");
+        }
+    }
 }
diff --git a/easemob-app-server/src/main/resources/application.properties b/easemob-app-server/src/main/resources/application.properties
@@ -7,20 +7,21 @@ spring.application.name=easemob-app-server
 
 #以下作为Server SDK的配置信息
 ## 环信console 注册获取的appkey、client id、client secret
-application.appkey=52117440#955012
+application.appkey=xxx
 
-application.appkey.white.list=41117440#984982
+## appkey 白名单
+application.appkey.white.list=xxx
 
-application.baseUri=http://a1-test.easemob.com
+application.baseUri=xxx
 ## 声网token过期时间(自已定义，不能超过1天)
 agora.token.expire.period.seconds=86400
 ## 声网console获取appid
-application.agoraAppId=63f1d5b33fd14a7ebc164c0a9920b8d0
+application.agoraAppId=xxx
 ## 声网console获取appcert
-application.agoraCert=15fbd260b8d5445db8ef11e26ee23d78
+application.agoraCert=xxx
 
-application.agoraAppId.white.list=63f1d5b33fd14a7ebc164c0a9920b8d0
-application.agoraCert.white.list=15fbd260b8d5445db8ef11e26ee23d78
+application.agoraAppId.white.list=xxx
+application.agoraCert.white.list=xxx
 
 ## 本地redis
 spring.redis.channel.nodes=tcp://127.0.0.1:6379
@@ -32,13 +33,11 @@ spring.redis.channel.expireTime=86400
 
 # Virgil creds
 ## <YOUR_ID>
-virgil.app.id=e3af9ea28ecd4e82a224dbdecfb0a699
+virgil.app.id=xxx
 ## <YOUR_PRIVATE_KEY>
-#virgil.app.private_key=MC4CAQAwBQYDK2VwBCIEIAWaQAY/xjqO8Yc3CJhbcAAQWoZkPUZf2MQpcoTHS7Un
-virgil.app.private_key=MC4CAQAwBQYDK2VwBCIEIANHajtvesy0XkY7rOMN92x88jnUGlM81QpmoTBaqRO4
-#virgil.app.private_key=MCowBQYDK2VwAyEAAR6aKlLaaDw3PJhzkp1bGrwu12Szzyot9ElLoK8k70I=
+virgil.app.private_key=xxx
 ## <YOUR_API_KEY_ID>
-virgil.app.key_id=49ae02a2f3054f5a19f66b12b2f8ab5d
+virgil.app.key_id=xxx
 ## 令牌有效期，单位小时
 virgil.app.ttl=1
 
@@ -57,9 +56,9 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect
 spring.jpa.hibernate.ddl-auto=validate
 
 ##  config for rest
-rest.auth-url=http://a1-test.easemob.com/management/token/superToken
-rest.username=superuser
-rest.password=easemob&&rest&&superToken
+rest.auth-url=xxx
+rest.username=xxx
+rest.password=xxx
 rest.readTimeout=1500
 rest.connectTimeout=1500
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public TokenController(TokenService tokenService) {`
`28`	`28`	`this.tokenService = tokenService;`
`29`	`29`	`}`
`30`	`30`
`31`		`- // to do 考虑server sdk提供直接生成rtc token的方法`
`32`	`31`	`@GetMapping("/token/rtc/channel/{channelName}/agorauid/{agoraUid}")`
`33`	`32`	`public ResponseEntity getAgoraRtcToken(@PathVariable String channelName,`
`34`	`33`	`@PathVariable Integer agoraUid,`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,8 @@ public interface RestService {`
`24`	`24`	`*/`
`25`	`25`	`String getChatUserUuid(String appkey, String chatUserName);`
`26`	`26`
	`27`	`+ void sendTextMessageToUser(String from, String to, String messageContent);`
	`28`	`+`
	`29`	`+ void sendCmdMessageToUser(String from, String to, String action);`
	`30`	`+`
`27`	`31`	`}`