切换新账户中心

pom.xml

@@ -104,8 +104,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.uas.account</groupId>
-            <artifactId>account-common</artifactId>
+            <groupId>com.uas.sso</groupId>
+            <artifactId>sso-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>

src/main/java/com/uas/ps/message/Application.java

@@ -4,6 +4,7 @@ package com.uas.ps.message;
 import com.uas.account.web.AccountConfigurer;
 import com.uas.ps.core.util.ContextUtils;
 //import com.uas.sso.web.SSOConfigurer;
+import com.uas.sso.web.AccountConfigurer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.event.ApplicationPreparedEvent;

src/main/java/com/uas/ps/message/domain/User.java

@@ -21,37 +21,27 @@ public class User implements Serializable {
 	/**
 	 * 用户名
 	 */
-	private String userName;
+	private String vipName;
 
 	/**
 	 * 邮箱
 	 */
-	private String userEmail;
+	private String email;
 
 	/**
 	 * 手机号
 	 */
-	private String userTel;
-
-	/**
-	 * 性别
-	 */
-	private String userSex;
-
-	/**
-	 * 是否管理员
-	 */
-	private Short issys;
+	private String mobile;
 
 	/**
 	 * imid
 	 */
-	private Long userIMId;
+	private Long imId;
 
 	/**
 	 * 所属当前登录公司
 	 */
-	private Enterprise enterprise;
+	private String spaceName;
 
 	public Long getUserUU() {
 		return userUU;
@@ -61,59 +51,43 @@ public class User implements Serializable {
 		this.userUU = userUU;
 	}
 
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserEmail() {
-		return userEmail;
-	}
-
-	public void setUserEmail(String userEmail) {
-		this.userEmail = userEmail;
-	}
-
-	public String getUserTel() {
-		return userTel;
+	public String getVipName() {
+		return vipName;
 	}
 
-	public void setUserTel(String userTel) {
-		this.userTel = userTel;
+	public void setVipName(String vipName) {
+		this.vipName = vipName;
 	}
 
-	public String getUserSex() {
-		return userSex;
+	public String getEmail() {
+		return email;
 	}
 
-	public void setUserSex(String userSex) {
-		this.userSex = userSex;
+	public void setEmail(String email) {
+		this.email = email;
 	}
 
-	public Short getIssys() {
-		return issys;
+	public String getMobile() {
+		return mobile;
 	}
 
-	public void setIssys(Short issys) {
-		this.issys = issys;
+	public void setMobile(String mobile) {
+		this.mobile = mobile;
 	}
 
-	public Long getUserIMId() {
-		return userIMId;
+	public Long getImId() {
+		return imId;
 	}
 
-	public void setUserIMId(Long userIMId) {
-		this.userIMId = userIMId;
+	public void setImId(Long imId) {
+		this.imId = imId;
 	}
 
-	public Enterprise getEnterprise() {
-		return enterprise;
+	public String getSpaceName() {
+		return spaceName;
 	}
 
-	public void setEnterprise(Enterprise enterprise) {
-		this.enterprise = enterprise;
+	public void setSpaceName(String spaceName) {
+		this.spaceName = spaceName;
 	}
 }

src/main/java/com/uas/ps/message/service/impl/MessageServiceImpl.java

@@ -1,10 +1,6 @@
 package com.uas.ps.message.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserView;
-import com.uas.account.util.AccountUtils;
-import com.uas.account.util.FlexJsonUtil;
 import com.uas.ps.core.page.PageInfo;
 import com.uas.ps.core.page.PageParams;
 import com.uas.ps.message.dao.AppDao;
@@ -12,6 +8,7 @@ import com.uas.ps.message.dao.MessageDao;
 import com.uas.ps.message.domain.App;
 import com.uas.ps.message.domain.Message;
 import com.uas.ps.message.domain.SmsMessage;
+import com.uas.ps.message.domain.User;
 import com.uas.ps.message.exception.IllegalOperatorException;
 import com.uas.ps.message.exception.ParameterMissingException;
 import com.uas.ps.message.service.MessageService;
@@ -22,6 +19,8 @@ import com.uas.ps.message.util.SMSType;
 import com.uas.ps.message.util.SplitChar;
 import com.uas.ps.message.util.account.HttpUtil;
 import com.uas.ps.message.util.account.HttpUtil.ResponseWrap;
+import com.uas.sso.util.AccountUtils;
+import com.uas.sso.util.FlexJsonUtil;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -35,7 +34,6 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -478,15 +476,15 @@ public class MessageServiceImpl implements MessageService {
         if (!CollectionUtils.isEmpty(messages)) {
             for (Message message : messages) {
                 try {
-                    UserView receiver = AccountUtils.getImUserByUserUU(message.getReceiverUu(),
+                   User receiver = (User) AccountUtils.getUserInfo(message.getReceiverUu(),
                         message.getReceiverEnuu());
-                    if (receiver.getName() != null) {
-                        LOGGER.info("接收人：" + receiver.getName());
+                    if (receiver.getVipName() != null) {
+                        LOGGER.info("接收人：" + receiver.getVipName());
 
-                        UserView sender = AccountUtils.getImUserByUserUU(message.getSenderUu(),
+                        User sender = (User) AccountUtils.getUserInfo(message.getSenderUu(),
                             message.getSenderEnuu());
-                        if (sender != null && sender.getName() != null && sender.getSpaceName() != null) {
-                            LOGGER.info("发送人：" + sender.getName());
+                        if (sender != null && sender.getVipName() != null && sender.getSpaceName() != null) {
+                            LOGGER.info("发送人：" + sender.getVipName());
 
                             boolean sendSuccess = false;
                             // 发送邮件
@@ -532,7 +530,7 @@ public class MessageServiceImpl implements MessageService {
      * @param receiver 接收人
      */
     private void sendMail(Message message, User receiver) {
-        if (message.getMailTemplate() != null && receiver.getSecondUID() != null) {
+        if (message.getMailTemplate() != null && receiver.getEmail() != null) {
             HttpHeaders headers = new HttpHeaders();
             MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
             headers.setContentType(type);
@@ -540,7 +538,7 @@ public class MessageServiceImpl implements MessageService {
 
             JSONObject object = new JSONObject();
             object.put("templateId", message.getMailTemplate());
-            object.put("receiver", receiver.getSecondUID());
+            object.put("receiver", receiver.getEmail());
             object.put("params", message.getContent());
 
 //            HttpEntity<String> formEntity = new HttpEntity<String>(, headers);
@@ -561,8 +559,8 @@ public class MessageServiceImpl implements MessageService {
      * @param sender 发送人
      * @return 推送成功状态
      */
-    private boolean sendSM(Message message, UserView receiver, UserView sender) {
-        if (!StringUtils.isEmpty(message.getSmTemplate()) && !StringUtils.isEmpty(receiver.getUid())) {
+    private boolean sendSM(Message message, User receiver, User sender) {
+        if (!StringUtils.isEmpty(message.getSmTemplate()) && !StringUtils.isEmpty(receiver.getMobile())) {
             try {
                 SmsMessage sms = new SmsMessage();
                 List<Object> obj = new ArrayList<Object>();
@@ -570,7 +568,7 @@ public class MessageServiceImpl implements MessageService {
                 switch (message.getSmTemplate()) {
                     // 公共询价单，普通短信
                     case "e14d502a-25b8-40a0-8acf-5c61ae38d763" :
-                        obj.add(receiver.getName());
+                        obj.add(receiver.getVipName());
                         obj.add(sender.getSpaceName());
                         obj.add(message.getRemark());
                         pushSm(sms, message, obj, receiver, sender);
@@ -579,7 +577,7 @@ public class MessageServiceImpl implements MessageService {
                     case "6e094dcf-f2c7-462a-9686-b2d32d684a78" :
                         obj.add(message.getSourceId());
                         obj.add(message.getReceiverEnuu());
-                        obj.add(receiver.getUid());
+                        obj.add(receiver.getMobile());
                         pushSm(sms, message, obj, receiver, sender);
                         break;
                     // 公共询价统计
@@ -608,9 +606,9 @@ public class MessageServiceImpl implements MessageService {
      * @param receiver 接收人
      * @param sender 发送人
      */
-    private void pushSm(SmsMessage sms, Message message, List<Object> param, UserView receiver, UserView sender) {
+    private void pushSm(SmsMessage sms, Message message, List<Object> param, User receiver, User sender) {
         sms.setParams(param);
-        sms.setReceiver(receiver.getUid());
+        sms.setReceiver(receiver.getMobile());
         sms.setTemplateId(message.getSmTemplate());
         String response = com.uas.ps.message.util.HttpUtil
             .sendPost(messageUrl, FastjsonUtils.toJson(sms));
@@ -623,7 +621,7 @@ public class MessageServiceImpl implements MessageService {
      * @param receiver 接收人
      * @param sender 发送人
      */
-    private void pushSuccess(Message message, UserView receiver, UserView sender) {
+    private void pushSuccess(Message message, User receiver, User sender) {
         message.setIsSent(Constant.YES);
         message.setReceiver(FastjsonUtils.toJson(receiver));
         message.setSender(FastjsonUtils.toJson(sender));
@@ -636,17 +634,17 @@ public class MessageServiceImpl implements MessageService {
      * @param consumerApp 消费app
      * @return 推送成功状态
      */
-    private boolean sendIM(Message message, UserView receiver, String consumerApp) {
+    private boolean sendIM(Message message, User receiver, String consumerApp) {
         Map<String, Object> params = new HashMap<>();
-        if (!StringUtils.isEmpty(receiver.getDialectUID())) {
+        if (!StringUtils.isEmpty(receiver.getImId())) {
             params.put("master", receiver.getSpaceName()); // 账套 公司名称
-            params.put("userid", receiver.getDialectUID()); // 推送目标用户
+            params.put("userid", receiver.getImId()); // 推送目标用户
             params.put("title", message.getType() == null ? "" : message.getType()); // 推送标题
             params.put("content", message.getContent()); // 正文
             params.put("enUU", message.getReceiverEnuu()); // UU号
             params.put("masterId", null);
             params.put("url", String.format(PUBLIC_INQUIRY_IM_URL, message.getSourceId(),
-                message.getReceiverEnuu(), receiver.getUid())); // 跳转链接地址
+                message.getReceiverEnuu(), receiver.getMobile())); // 跳转链接地址
             params.put("pageTitle", message.getType() == null ? "" : message.getType());
             params.put("platform", "B2B"); // 系统名称，ERP或B2B
             try {

src/main/resources/application.yml

@@ -1,4 +1,6 @@
 spring:
+  profiles:
+      active: dev
   jpa:
     database: MYSQL
     show-sql: false
@@ -13,4 +15,6 @@ spring:
          auto: update
 
 sso:
- secretKey: 0taQcW073Z7G628g5H
+ secretKey: 0taQcW073Z7G628g5H
+server:
+  port: 20000

src/main/resources/config/account-dev.properties

@@ -1,3 +1,3 @@
 ### account center config,
-account.us.save.url=http://10.10.100.133/api/userspace
-account.user.save.url=http://10.10.100.133/api/user
+account.us.save.url=http://192.168.253.6:32323/api/userspace
+account.user.save.url=http://192.168.253.6:32323/api/user

src/main/resources/config/account-prod.properties

@@ -1,3 +1,3 @@
 ### account center config,
-account.us.save.url=http://10.10.100.133:8080/api/userspace
-account.user.save.url=http://10.10.100.133:8080/api/user
+account.us.save.url=https://sso.ubtob.com/api/userspace
+account.user.save.url=https://sso.ubtob.com/api/user

src/main/resources/config/account-test.properties

@@ -1,3 +1,3 @@
 ### account center config,
-account.us.save.url=http://10.10.100.133/api/userspace
-account.user.save.url=http://10.10.100.133/api/user
+account.us.save.url=http://192.168.253.6:32323/api/userspace
+account.user.save.url=http://192.168.253.6:32323/api/user