对接新账户中心登录修改。

donate-console/src/main/java/com/uas/console/donate/SSOConfiguration.java

@@ -1,6 +1,6 @@
 package com.uas.console.donate;
 
-import com.uas.account.web.AccountConfigurer;
+import com.uas.sso.web.AccountConfigurer;
 import com.uas.console.donate.profile.Dev;
 import com.uas.console.donate.profile.Prod;
 import com.uas.console.donate.profile.Test;

donate-console/src/main/java/com/uas/console/donate/controller/SecurityController.java

@@ -1,6 +1,5 @@
 package com.uas.console.donate.controller;
 
-import com.uas.account.entity.UserView;
 import com.uas.console.donate.core.support.SystemSession;
 import com.uas.console.donate.model.UsageBufferedLogger;
 import com.uas.console.donate.model.User;
@@ -12,6 +11,7 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -155,10 +155,10 @@ public class SecurityController extends CommonController {
                 tk.setTime(token.getTime());
                 tk.setData(token.getData());
                 SSOHelper.setSSOCookie(request, response, tk, true);
-                UserView user = getUserByToken(tk);
+                UserAccount user = getUserByToken(tk);
                 if (user != null) {
                     request.getSession().setAttribute("user", user);
-                    User u = userService.findOne(Long.valueOf(user.getDialectUID()));
+                    User u = userService.findOne(user.getUserUU());
                     SystemSession.setUser(u);
                 }
                 // returnUrl有时候为null，然后生成URL的时候会出现undefined
@@ -168,10 +168,10 @@ public class SecurityController extends CommonController {
         return null;
     }
 
-    private UserView getUserByToken(SSOToken token) {
-        UserView authedUser = null;
+    private UserAccount getUserByToken(SSOToken token) {
+        UserAccount authedUser = null;
         if (token.getData() != null) {
-            authedUser = FastjsonUtils.fromJson(token.getData(), UserView.class);
+            authedUser = FastjsonUtils.fromJson(token.getData(), UserAccount.class);
         }
         return authedUser;
     }

donate-console/src/main/java/com/uas/console/donate/model/User.java

@@ -1,6 +1,5 @@
 package com.uas.console.donate.model;
 
-import com.uas.account.entity.UserView;
 import com.uas.sso.entity.UserAccount;
 
 import javax.persistence.*;
@@ -83,14 +82,6 @@ public class User implements Serializable{
 
     }
 
-    public User(UserView user) {
-        this.setType("个人用户");
-        this.setUserUU(Long.valueOf(user.getDialectUID()));
-        this.setName(user.getName());
-        this.setTel(user.getUid());
-        this.setEmail(user.getSecondUID());
-    }
-
     public User(UserAccount userAccount) {
         this.setType("个人用户");
         this.setUserUU(Long.valueOf(userAccount.getUserUU()));

donate-console/src/main/java/com/uas/console/donate/service/impl/MessageServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.console.donate.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.console.donate.MessageConfiguration;
 import com.uas.console.donate.core.support.SystemSession;
 import com.uas.console.donate.dao.MessageDao;
@@ -81,7 +82,7 @@ public class MessageServiceImpl implements MessageService {
                         pageInfo.expression(PredicateUtils.gte("publishDate", filter.getFromDate(), false));
                     } else {
                         //没选择时间段，就从当前时间过滤
-                        pageInfo.expression(PredicateUtils.gte("publishDate", new Date().getTime(), false));
+                        pageInfo.expression(PredicateUtils.gte("publishDate", System.currentTimeMillis(), false));
                     }
                 }
                 query.where(pageInfo.getPredicates(root, query, builder));
@@ -169,7 +170,8 @@ public class MessageServiceImpl implements MessageService {
                 if (null == receiver.getUserIMId()) {
                     Long imId = null;
                     try {
-                        imId = AccountUtils.getImIdByUserUU(messageDetail.getReceiveUserUU());
+                        UserView userView = AccountUtils.findByUserUU(messageDetail.getReceiveUserUU());
+                        imId = Long.valueOf(userView.getImId());
                     } catch (Exception e) {
                         logger.log("推送消息", "根据uu获取imId失败:" + messageDetail.getReceiveUserUU(), null, messageDetail.getMessage().getUserUU());
                         e.printStackTrace();

donate-service/src/main/java/com/uas/service/donate/SSOConfiguration.java

@@ -1,6 +1,6 @@
 package com.uas.service.donate;
 
-import com.uas.account.web.AccountConfigurer;
+import com.uas.sso.web.AccountConfigurer;
 import com.uas.service.donate.profile.Dev;
 import com.uas.service.donate.profile.Prod;
 import com.uas.service.donate.profile.Test;

donate-service/src/main/java/com/uas/service/donate/controller/SecurityController.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.controller;
 
-import com.uas.account.entity.UserView;
 import com.uas.service.donate.core.support.SystemSession;
 import com.uas.service.donate.model.User;
 import com.uas.service.donate.service.UserService;
@@ -10,6 +9,7 @@ import com.uas.sso.AuthToken;
 import com.uas.sso.SSOConfig;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.ModelMap;
@@ -158,10 +158,10 @@ public class SecurityController extends CommonController {
                 tk.setTime(token.getTime());
                 tk.setData(token.getData());
                 SSOHelper.setSSOCookie(request, response, tk, true);
-                UserView user = getUserByToken(tk);
+                UserAccount user = getUserByToken(tk);
                 if (user != null) {
                     request.getSession().setAttribute("user", user);
-                    User u = userService.findOne(Long.valueOf(user.getDialectUID()));
+                    User u = userService.findOne(user.getUserUU());
                     SystemSession.setUser(u);
                 }
                 // returnUrl有时候为null，然后生成URL的时候会出现undefined
@@ -171,10 +171,10 @@ public class SecurityController extends CommonController {
         return null;
     }
 
-    private UserView getUserByToken(SSOToken token) {
-        UserView authedUser = null;
+    private UserAccount getUserByToken(SSOToken token) {
+        UserAccount authedUser = null;
         if (token.getData() != null) {
-            authedUser = FastjsonUtils.fromJson(token.getData(), UserView.class);
+            authedUser = FastjsonUtils.fromJson(token.getData(), UserAccount.class);
         }
         return authedUser;
     }

donate-service/src/main/java/com/uas/service/donate/model/User.java

@@ -2,7 +2,7 @@ package com.uas.service.donate.model;
 
 
 import com.uas.sso.entity.UserAccount;
-import com.uas.account.entity.UserView;
+import com.uas.sso.entity.UserView;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -82,30 +82,22 @@ public class User implements Serializable{
 
     }
 
-    public User(UserView user) {
-        this.setType("个人用户");
-        this.setUserUU(Long.valueOf(user.getDialectUID()));
-        this.setName(user.getName());
-        this.setTel(user.getUid());
-        this.setEmail(user.getSecondUID());
-    }
-
-    public User(com.uas.account.entity.User accountUser) {
-        this.setType("个人用户");
-        this.setUserUU(Long.valueOf(accountUser.getDialectUID()));
-        this.setName(accountUser.getName());
-        this.setTel(accountUser.getUid());
-        this.setEmail(accountUser.getSecondUID());
-    }
-
     public User(UserAccount userAccount) {
         this.setType("个人用户");
-        this.setUserUU(Long.valueOf(userAccount.getUserUU()));
+        this.setUserUU(userAccount.getUserUU());
         this.setName(userAccount.getVipName());
         this.setTel(userAccount.getMobile());
         this.setEmail(userAccount.getEmail());
     }
 
+    public User(UserView accountUser) {
+        this.setType("个人用户");
+        this.setUserUU(accountUser.getUserUU());
+        this.setName(accountUser.getVipName());
+        this.setTel(accountUser.getMobile());
+        this.setEmail(accountUser.getEmail());
+    }
+
     public Long getUserUU() {
         return userUU;
     }

donate-service/src/main/java/com/uas/service/donate/service/impl/MessageServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.service.impl;
 
-import com.uas.account.util.AccountUtils;
 import com.uas.message.mail.service.MailService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
@@ -22,7 +21,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.sql.Savepoint;
 import java.util.*;
 
 /**

donate-service/src/main/java/com/uas/service/donate/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.uas.service.donate.service.impl;
 
-import com.uas.account.util.AccountUtils;
+import com.uas.sso.entity.UserView;
+import com.uas.sso.util.AccountUtils;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
@@ -41,6 +42,7 @@ public class UserServiceImpl implements UserService {
     static final Short NOT_READ = 0;
 
     //返回某人个人信息
+    @Override
     public User findOne(Long id){
         return userDao.findOne(id);
     }
@@ -53,11 +55,11 @@ public class UserServiceImpl implements UserService {
      */
     @Override
     public User getUserByImId(Long imId) {
-        com.uas.account.entity.User accountUser = null;
+        UserView accountUser = null;
         try {
             accountUser = AccountUtils.getUserByImId(imId);
-            if (null != accountUser && null != accountUser.getDialectUID()) {
-                User user = userDao.findOne(Long.valueOf(accountUser.getDialectUID()));
+            if (null != accountUser && null != accountUser.getUserUU()) {
+                User user = userDao.findOne(accountUser.getUserUU());
                 if (null == user) {
                     user = new User(accountUser);
                     user.setUserIMId(imId);
@@ -160,7 +162,7 @@ public class UserServiceImpl implements UserService {
                     pageInfo.expression(PredicateUtils.or(PredicateUtils.eq("receiveUserUU", userUU, false),
                             PredicateUtils.eq("message.receiver", "所有用户", false)));
                     // 发布时间比当前时间早的
-                    pageInfo.expression(PredicateUtils.gte("publishDate", new Date().getTime(), false));
+                    pageInfo.expression(PredicateUtils.gte("publishDate", System.currentTimeMillis(), false));
                     query.where(pageInfo.getPredicates(root, query, cb));
                     return null;
                 }

donate-service/src/main/resources/templates/activeCenter.ftl

@@ -592,7 +592,7 @@
     //登录
     $("#login").click(function(){
         $.ajax({
-            url:"http://lj.ubtob.com/sso/login",
+            url:"/sso/login",
             data:{returnUrl:returnUrl},
             type:"GET",
             success:function(data){
@@ -626,7 +626,7 @@
     //退出
     $("#logout").click(function(){
         $.ajax({
-            url:"http://lj.ubtob.com/sso/logout",
+            url:"sso/logout",
             type:"GET",
             data:{returnUrl:returnUrl},
             success:function(data){

donate-service/src/main/resources/templates/index.ftl

@@ -922,7 +922,7 @@
     //登录
     $("#login").click(function(){
         $.ajax({
-            url:"http://lj.ubtob.com/sso/login",
+            url:"/sso/login",
             data:{returnUrl:returnUrl},
             type:"GET",
             success:function(data){
@@ -956,7 +956,7 @@
     //退出
     $("#logout").click(function(){
        $.ajax({
-           url:"http://lj.ubtob.com/sso/logout",
+           url:"sso/logout",
            type:"GET",
            data:{returnUrl:returnUrl},
            success:function(data){