Просмотр исходного кода

Merge branch 'master' into test

# Conflicts:
#	src/main/resources/props/config_local.properties
anderx лет назад: 2
Родитель
Сommit
92bda5eca8
23 измененных файлов с 406 добавлено и 229 удалено
  1. 11 0
      .project
  2. 6 0
      pom.xml
  3. 14 14
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  4. 4 4
      src/main/java/com/goafanti/admin/controller/AdminSystemController.java
  5. 54 55
      src/main/java/com/goafanti/app/controller/AppUserController.java
  6. 13 23
      src/main/java/com/goafanti/app/controller/OpenAppUserController.java
  7. 65 0
      src/main/java/com/goafanti/common/bean/WebSocketClientBean.java
  8. 11 1
      src/main/java/com/goafanti/common/controller/PublicController.java
  9. 2 1
      src/main/java/com/goafanti/common/utils/BaiduChatUtils.java
  10. 45 0
      src/main/java/com/goafanti/common/webSocket/MsgWebSocketClient.java
  11. 47 0
      src/main/java/com/goafanti/common/webSocket/WebClientEnum.java
  12. 5 2
      src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java
  13. 5 1
      src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java
  14. 5 1
      src/main/java/com/goafanti/core/websocket/WebSocketHandshakeInterceptor.java
  15. 3 3
      src/main/java/com/goafanti/easemob/queue/EasemobRedisQueueListener.java
  16. 3 3
      src/main/java/com/goafanti/message/queue/MessageRedisQueueListener.java
  17. 8 8
      src/main/java/com/goafanti/message/service/impl/JtMessageProducerServiceImpl.java
  18. 21 21
      src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java
  19. 58 58
      src/main/java/com/goafanti/user/controller/UserApiController.java
  20. 0 13
      src/main/java/com/goafanti/user/controller/UserRegisterController.java
  21. 5 5
      src/main/resources/props/config_local.properties
  22. 2 0
      src/main/resources/shiro_base_auth.ini
  23. 19 16
      src/main/resources/spring/spring-shiro.xml

+ 11 - 0
.project

@@ -39,4 +39,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1689561113638</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

+ 6 - 0
pom.xml

@@ -90,6 +90,12 @@
 			<artifactId>spring-websocket</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
+		<!--webSocket客户端-->
+		<dependency>
+			<groupId>org.java-websocket</groupId>
+			<artifactId>Java-WebSocket</artifactId>
+			<version>1.4.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-messaging</artifactId>

+ 14 - 14
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -63,8 +63,8 @@ public class AdminApiController extends CertifyApiController {
 	private AdminService					adminService;
 	@Resource
 	private JpushEasemobAccountService 		jpushEasemobAccountService;
-	@Autowired
-	EasemobUtils							easemobUtils;
+//	@Autowired
+//	EasemobUtils							easemobUtils;
 
 	/**
 	 * 获取营销员及营销经理下拉
@@ -373,11 +373,11 @@ public class AdminApiController extends CertifyApiController {
 		//res.setData(organizationIdentityService.updateOrgDetail(oi, saveSign, level));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 团体用户明细
-	 * 
+	 *
 	 * type 0-个人  1-单位
 	 */
 	@RequestMapping(value = "/listJpushUser", method = RequestMethod.GET)
@@ -390,7 +390,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(jpushEasemobAccountService.findJpushClientsByType(type, pageNo, pageSize));
 		return res;
 	}
-	
+
 	//获得专家顾问审核数据
 	@RequestMapping(value="/getExpertAuditList", method = RequestMethod.GET )
 	public Result getExpertAuditList(InputUserIdentity identity, Integer pageNo, Integer pageSize){
@@ -398,7 +398,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userIdentityService.getExpertAuditList(identity, pageNo, pageSize));
 		return res;
 	}
-	
+
 	//获得某个人认证的详情信息
 	@RequestMapping(value="/getUserIdentityByUid" , method = RequestMethod.GET)
 	public Result getUserIdentityByUid(String uid){
@@ -406,7 +406,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userIdentityService.getUserIdentityByUid(uid));
 		return res;
 	}
-		
+
 	//管理员更改审核状态
 	@RequestMapping(value="/auditing", method = RequestMethod.POST)
 	public Result auditing(UserIdentity identity){
@@ -430,7 +430,7 @@ public class AdminApiController extends CertifyApiController {
 			res.setData(userIdentityService.updateAuditing(identity));
 			return res;
 		}
-	
+
 	//获得注册用户信息
 	@RequestMapping(value="/user/info", method = RequestMethod.GET)
 	public Result userInfo(User user, Integer pageNo, Integer pageSize){
@@ -441,7 +441,7 @@ public class AdminApiController extends CertifyApiController {
 		res.setData(userService.getUserInfo(user, pageNo, pageSize));
 		return res;
 	}
-	
+
 	//管理员修改用户图片
 		@RequestMapping(value="/updatePictureUrl", method = RequestMethod.GET)
 		public Result updatePictureUrl(String uid,String url){
@@ -453,8 +453,8 @@ public class AdminApiController extends CertifyApiController {
 			res.setData(userService.updatePictureUrl(uid, url));
 			return res;
 		}
-	
-		
+
+
 		/**
 		 * 	管理员上传用户图片
 		 * @param req
@@ -472,6 +472,6 @@ public class AdminApiController extends CertifyApiController {
 	        }
 	        return res;
 	    }
-	
-	
+
+
 }

+ 4 - 4
src/main/java/com/goafanti/admin/controller/AdminSystemController.java

@@ -20,8 +20,8 @@ import com.goafanti.easemob.enums.EasemonSysUsers;
 @RequestMapping(value = "/api/admin")
 public class AdminSystemController extends BaseApiController {
 
-	@Autowired
-	EasemobUtils easemobUtils;
+//	@Autowired
+//	EasemobUtils easemobUtils;
 
 	/**
 	 * 初始化系统消息用户
@@ -34,7 +34,7 @@ public class AdminSystemController extends BaseApiController {
 				jo.put("username", esu.getUsername());
 				jo.put("nickname", esu.getNickname());
 				jo.put("password", System.currentTimeMillis());
-				easemobUtils.sendLater(new EasemobInfo().uri("/users").data(jo.toJSONString()).method(HttpMethod.POST));
+//				easemobUtils.sendLater(new EasemobInfo().uri("/users").data(jo.toJSONString()).method(HttpMethod.POST));
 			}
 			return res().data(true);
 		}
@@ -47,7 +47,7 @@ public class AdminSystemController extends BaseApiController {
 	@RequestMapping(value = "/sys/sendMsg", method = RequestMethod.GET)
 	public Result sendMsg(String from, String to, String msg) {
 		if (isSuperAdmin()) {
-			easemobUtils.sendMessage(from, to, new ModelMap("nickname", EasemonSysUsers.getNickname(from)), msg, true);
+//			easemobUtils.sendMessage(from, to, new ModelMap("nickname", EasemonSysUsers.getNickname(from)), msg, true);
 			return res().data(true);
 		}
 		return res().data(false);

+ 54 - 55
src/main/java/com/goafanti/app/controller/AppUserController.java

@@ -69,8 +69,8 @@ public class AppUserController extends CertifyApiController {
 	private UserService userServiceImpl;
 	@Resource
 	private MessageService messageService;
-	@Resource
-	private EasemobUtils   easemobUtils;
+//	@Resource
+//	private EasemobUtils   easemobUtils;
 	@Resource
 	private BannersService		bannersService;
 	@Resource
@@ -82,7 +82,7 @@ public class AppUserController extends CertifyApiController {
 	@Resource
 	private UserCareerService	userCareerService;
 	@Resource
-	private UserInterestService userInterestService; 
+	private UserInterestService userInterestService;
 	@Resource
 	private UserIdentityService	userIdentityService;
 	@Resource
@@ -97,7 +97,7 @@ public class AppUserController extends CertifyApiController {
 	private UserService	userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
-	
+
 	@RequestMapping(value = "/uploadImg",method = RequestMethod.POST)
 	public Result uploadAvatar(HttpServletRequest req){
 		Result res = new Result();
@@ -117,8 +117,8 @@ public class AppUserController extends CertifyApiController {
 		Result res = new Result();
 		if(u!=null&&StringUtils.isNotEmpty(u.getMobile())){
 			//验证手机号码格式是否正确
-			Pattern p = Pattern.compile("^(1[1-9][0-9])\\d{8}$"); // 验证手机号           
-			Matcher m = p.matcher(u.getMobile());   
+			Pattern p = Pattern.compile("^(1[1-9][0-9])\\d{8}$"); // 验证手机号
+			Matcher m = p.matcher(u.getMobile());
 			if(!m.matches()){
 				res.getError().add(buildError("电话号码格式不对","电话号码格式不对"));
 			}else{
@@ -133,28 +133,28 @@ public class AppUserController extends CertifyApiController {
 		userServiceImpl.updateByPrimaryKeySelective(u);
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/logout",method = RequestMethod.GET)
 	public Result logout(HttpServletRequest request){
 		Result res = new Result();
 		TokenManager.logout();
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/userInfo",method = RequestMethod.GET)
 	public Result userInfo(HttpServletRequest request){
 		Result res = new Result();
 		res.setData(userServiceImpl.selectBaseInfo());
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public Result index(){
 		Result res = new Result();
 		res.setData(messageService.selectMessageWithGroup());
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/listMessage", method = RequestMethod.POST)
 	public Result listMessage(Integer subject,Integer sourceType,Integer pageNo,Integer pageSize){
 		Result res = new Result();
@@ -164,7 +164,7 @@ public class AppUserController extends CertifyApiController {
 		}*/
 		User u = TokenManager.getUserToken();
 		if(u != null){
-			List<MessageBo> boList = messageService.selectSyncMessage(u.getId()); 
+			List<MessageBo> boList = messageService.selectSyncMessage(u.getId());
 			if(boList != null && boList.size()>0){
 				List<MessageProducer> producers = new ArrayList<MessageProducer>();
 				List<MessageConsumer> consumers = new ArrayList<MessageConsumer>();
@@ -190,14 +190,13 @@ public class AppUserController extends CertifyApiController {
 		res.setData(messageService.listPersonalMessage(subject,sourceType,pageNo,pageSize));
 		return res;
 	}
-	
-	
-	
+
+
+
 	/**
 	 * 同步绑定账号
 	 * @param uuid
 	 * @param registrationId
-	 * @param userName
 	 */
 	@RequestMapping(value = "/synBindingAccount",method = RequestMethod.POST)
 	private Result synBindingAccount(String uuid,String registrationId,String easemobName,String easemobPass){
@@ -206,12 +205,12 @@ public class AppUserController extends CertifyApiController {
 		messageService.updateJpushEasemobAccount(uuid, registrationId, easemobName,easemobPass);
 		return res;
 	}
-	
+
 	/*
 	 * 更新极光推送
-	 * 
+	 *
 	 * */
-	
+
 	@RequestMapping(value = "/updateJpushAccount",method = RequestMethod.POST)
 	private Result updateJpush(String uuid,String registrationId,String easemobName,String easemobPass,String uid){
 		Result res = new Result();
@@ -223,12 +222,12 @@ public class AppUserController extends CertifyApiController {
 		messageService.updateJpushEasemobAccount(uuid, registrationId, easemobName,easemobPass);
 		return res;
 	}
-	
+
 	/**
 	 * 读取消息
 	 * @param messageId
-	 * @throws IllegalAccessException 
-	 * @throws InvocationTargetException 
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
 	 */
 	@RequestMapping(value = "/readMessage",method = RequestMethod.GET)
 	private Result readMessage(String messageId){
@@ -255,8 +254,8 @@ public class AppUserController extends CertifyApiController {
 	/**
 	 * 读取推送消息
 	 * @param messageId
-	 * @throws IllegalAccessException 
-	 * @throws InvocationTargetException 
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
 	 */
 	@RequestMapping(value = "/readJpushMessage",method = RequestMethod.GET)
 	private Result readJpushMessage(String messageId){
@@ -280,8 +279,8 @@ public class AppUserController extends CertifyApiController {
 		res.setData(jsonObject);
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 关注功能
 	 */
@@ -301,11 +300,11 @@ public class AppUserController extends CertifyApiController {
 		}else {
 			res.setData(achievementInterestService.deleteInterest( uid, type, objectId,interest));
 		}
-			
+
 		return res;
 	}
-	
-	
+
+
 
 
 	/**
@@ -350,7 +349,7 @@ public class AppUserController extends CertifyApiController {
 		res.setData(demandService.selectinterest(type, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 成果详情
 	 * @param id
@@ -379,7 +378,7 @@ public class AppUserController extends CertifyApiController {
 		res.setData(demandService.selectAppDemandDetail( id));
 		return res;
 	}
-	
+
 	/**
      * 新增成果
      */
@@ -404,7 +403,7 @@ public class AppUserController extends CertifyApiController {
                     AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
             return res;
         }
-        
+
        res = disposeInputAchievement(res, ia, keywords);
         if (!res.getError().isEmpty()) {
             return res;
@@ -414,7 +413,7 @@ public class AppUserController extends CertifyApiController {
         res.setData(achievementService.saveAppAchievement(a, keywords));
         return res;
     }
-    
+
     private Result disposeInputAchievement(Result res, InputAchievement ia, String[] keywords) {
         if (StringUtils.isBlank(ia.getName())) {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
@@ -444,7 +443,7 @@ public class AppUserController extends CertifyApiController {
         }
         return res;
     }
-    
+
     /**
 	 * 新增需求
 	 */
@@ -482,7 +481,7 @@ public class AppUserController extends CertifyApiController {
 		res.setData(demandService.saveAppUserDemand(d, validityPeriodFormattedDate, keywords));
 		return res;
 	}
-	
+
 	private Result disposeDemand(Result res, InputDemand demand, String[] keywords) {
 		if (StringUtils.isBlank(demand.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求名称", "需求名称"));
@@ -513,7 +512,7 @@ public class AppUserController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到问题说明", "问题说明"));
 			return res;
 		}
-		
+
 
 		/*for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
@@ -524,8 +523,8 @@ public class AppUserController extends CertifyApiController {
 
 		return res;
 	}
-    
-    
+
+
     /**
      * 成果、需求图片上传
      */
@@ -554,7 +553,7 @@ public class AppUserController extends CertifyApiController {
     	res.setData(fieldGlossoryService.getField(pid, level));
     	return res;
     }
-	
+
 
 	/**
 	 * 获取环信登录账号,如果未注册则先注册
@@ -563,15 +562,15 @@ public class AppUserController extends CertifyApiController {
 	public Result getEasemob() {
 		User u = TokenManager.getUserToken();
 		if (u != null) {
-			JSONObject res = easemobUtils.send(new EasemobInfo().uri("/users/" + u.getNumber()).method(HttpMethod.GET));
+//			JSONObject res = easemobUtils.send(new EasemobInfo().uri("/users/" + u.getNumber()).method(HttpMethod.GET));
 			JSONObject resultObj = new JSONObject();
 			resultObj.put("easemobPass", new SimpleHash("md5", u.getId(), null, 1).toHex());
 			resultObj.put("easemobName", String.valueOf(u.getNumber()));
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			if (res == null || StringUtils.equals("service_resource_not_found", (CharSequence) res.get("error"))) {
-				easemobUtils.sendLater(
-						new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
-			}
+//			if (res == null || StringUtils.equals("service_resource_not_found", (CharSequence) res.get("error"))) {
+//				easemobUtils.sendLater(
+//						new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
+//			}
 			return res().data(resultObj);
 		} else {
 			return res().error(buildError("user only", "必须是登录会员才能访问。"));
@@ -605,26 +604,26 @@ public class AppUserController extends CertifyApiController {
 			}
 		}
 		return res;
-		
+
 	}
-	
+
 
 	/*APP我的订单列表
 	 * userType-----0-购买者   1-出售者  2-管理员
-	 * 
+	 *
 	 * */
 	@RequestMapping(value="/orderList",method = RequestMethod.GET)
 	public Result getMyJtOrderList(Integer orderType,Integer userType,Integer pageNo,Integer pageSize) {
 		Result result=new Result();
-		if(userType==null || userType>1 || userType<0) { 
+		if(userType==null || userType>1 || userType<0) {
 			result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","用户类型错误"));
 			return result;
 		}
 		result.setData(jtOrderService.appSearchOrderList(orderType, userType, pageNo, pageSize));
-		
+
 		return result;
 	}
-	
+
 	/*
 	 * APP我的成果列表
 	 **/
@@ -639,7 +638,7 @@ public class AppUserController extends CertifyApiController {
 		}
 		Pagination<AchievementObject> p=achievementService.listMyAchievement(auditStatus, name, dataCategory,
 				 startDate, endDate,cStartDate, cEndDate, pageNo, pageSize);
-		result.data(p); 
+		result.data(p);
 		return result;
 	}
 	/**
@@ -707,8 +706,8 @@ public class AppUserController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到关键词", "关键词"));
 			return res;
 		}
-		
-	
+
+
 		for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "关键词长度"));
@@ -805,7 +804,7 @@ public class AppUserController extends CertifyApiController {
 
 		return res;
 	}
-	
+
 	/*
 	 * 收藏列表 0 成果 1需求 2项目
 	 * */
@@ -868,7 +867,7 @@ public class AppUserController extends CertifyApiController {
 		result.setData(messageService.updateAppReadMessage(id));
 		return result;
 	}
-	
+
 	/** 图片上传 **/
 	@RequestMapping(value = "/uploadHeadPortrait", method = RequestMethod.POST)
 	public Result uploadCustomerImg(HttpServletRequest req,String sign){
@@ -876,5 +875,5 @@ public class AppUserController extends CertifyApiController {
 		res.setData(handleFile(res, "/customer_head_portrait/", false, req, sign));
 		return res;
 	}
-	
+
 }

+ 13 - 23
src/main/java/com/goafanti/app/controller/OpenAppUserController.java

@@ -44,35 +44,25 @@ import com.goafanti.user.service.UserService;
 @RestController
 @RequestMapping(value = "/open/app/user")
 public class OpenAppUserController extends BaseApiController {
-	@Resource
-	private UserService userServiceImpl;
+
 	@Resource
 	private MessageService messageService;
 	@Resource
 	private CommentService 	commentService;
-	@Resource
-	private EasemobUtils   easemobUtils;
-	@Resource
-	private BannersService		bannersService;
-	@Resource
-	private NewsService			newsService;
+
 	@Resource
 	private AchievementService	achievementService;
 	@Resource
 	private DemandService		demandService;
-	@Resource
-	private UserCareerService	userCareerService;
-	@Resource
-	private UserInterestService userInterestService; 
+
 	@Resource
 	private UserIdentityService	userIdentityService;
-	@Resource
-	private AchievementInterestService achievementInterestService;
+
 	@Resource
 	private UserService	userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
-	
+
 	/**
 	 * 成果详情
 	 * @param id
@@ -101,7 +91,7 @@ public class OpenAppUserController extends BaseApiController {
 		res.setData(demandService.selectAppDemandDetail( id));
 		return res;
 	}
-	
+
 	/**
 	 * 专家、顾问详情
 	 */
@@ -115,7 +105,7 @@ public class OpenAppUserController extends BaseApiController {
 		res.setData(userIdentityService.selectExpertsDetail( id));
 		return res;
 	}
-	
+
 	/**
 	 * 专家、顾问评价
 	 */
@@ -136,17 +126,17 @@ public class OpenAppUserController extends BaseApiController {
 		res.setData(commentResult);
 		return res;
 	}
-	
+
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public Result index(){
 		Result res = new Result();
 		res.setData(messageService.selectMessageWithGroup());
 		return res;
 	}
-	
+
 	/**
 	 * APP用户注册检查
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */
@@ -159,7 +149,7 @@ public class OpenAppUserController extends BaseApiController {
 					UserFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(user.getMobile())) {
 			res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "手机号码不能为空"));
 			return res;
@@ -177,12 +167,12 @@ public class OpenAppUserController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.MCODE_OVERTIME_ERROR, "手机验证码超时失效"));
 			return res;
 		}
-		
+
 		return res.data(1);
 	}
 	/**
 	 * APP用户注册
-	 * 
+	 *
 	 * @param user
 	 * @return
 	 */

+ 65 - 0
src/main/java/com/goafanti/common/bean/WebSocketClientBean.java

@@ -0,0 +1,65 @@
+package com.goafanti.common.bean;
+
+import com.goafanti.common.utils.LoggerUtils;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.drafts.Draft_6455;
+import org.java_websocket.enums.ReadyState;
+import org.java_websocket.handshake.ServerHandshake;
+
+import java.net.URI;
+
+public class WebSocketClientBean {
+
+    private static String url="ws://chat.xunmengren.net:11000/ws/1683470612048";
+    private static String test_url="ws://localhost:8888/websocket/10086";
+//    @Bean
+    public static WebSocketClient webSocketClient() {
+        try {
+            WebSocketClient webSocketClient = new WebSocketClient(new URI(test_url),new Draft_6455()){
+
+                @Override
+                public void onOpen(ServerHandshake serverHandshake) {
+                    LoggerUtils.debug(getClass(),"建立连接");
+                }
+
+                @Override
+                public void onMessage(String s) {
+                    LoggerUtils.debug(getClass(),"收到来自服务端消息:"+s);
+                }
+
+                @Override
+                public void onClose(int i, String s, boolean b) {
+                    LoggerUtils.debug(getClass(),"关闭连接:::" + "i = " + i + ":::s = " + s +":::b = " + b);
+                }
+
+                @Override
+                public void onError(Exception e) {
+                    LoggerUtils.debug(getClass(),"报错了:::" + e.getMessage());
+                }
+
+                @Override
+                public void send(String text) {
+                    LoggerUtils.debug(getClass(),"发送消息:::"+text);
+                    super.send(text);
+                }
+            };
+
+            webSocketClient.connect();
+            return webSocketClient;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static void main(String[] args) {
+        WebSocketClient webSocketClient = webSocketClient();
+        //先等待连接上
+        while (!webSocketClient.getReadyState().equals(ReadyState.OPEN)){
+
+        }
+        webSocketClient.send("666");
+        webSocketClient.close();
+    }
+}

+ 11 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -912,7 +912,17 @@ public class PublicController extends BaseController {
 		return res.data(str);
 	}
 
-
+	@RequestMapping(value = "/SelectwebSocket",method = RequestMethod.GET)
+	@ResponseBody
+	public Result  SelectwebSocket (String text){
+		Result res=new Result();
+		Map<String,Object> params=new HashMap();
+		List<String> list =new ArrayList<>();
+		params.put("type","text");
+		params.put("msg",text);
+//		MyWebSocketClient
+		return res.data("");
+	}
 
 
 

+ 2 - 1
src/main/java/com/goafanti/common/utils/BaiduChatUtils.java

@@ -8,6 +8,7 @@ import com.goafanti.common.error.BusinessException;
 import okhttp3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 
 import java.io.*;
@@ -20,7 +21,7 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
-
+@Configuration
 public class BaiduChatUtils {
     private final static  Integer MAX_IP_COUNT=5;
 

+ 45 - 0
src/main/java/com/goafanti/common/webSocket/MsgWebSocketClient.java

@@ -0,0 +1,45 @@
+package com.goafanti.common.webSocket;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Iterator;
+
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+
+public class MsgWebSocketClient extends WebSocketClient{
+
+    public MsgWebSocketClient(String url) throws URISyntaxException {
+        super(new URI(url));
+        // TODO Auto-generated constructor stub
+    }
+
+    @Override
+    public void onOpen(ServerHandshake shake) {
+        // TODO Auto-generated method stub
+        System.out.println("握手...");
+        for(Iterator<String> it=shake.iterateHttpFields();it.hasNext();) {
+            String key = it.next();
+            System.out.println(key+":"+shake.getFieldValue(key));
+        }
+    }
+
+    @Override
+    public void onMessage(String paramString) {
+        // TODO Auto-generated method stub
+        System.out.println("接收到消息:"+paramString);
+    }
+
+    @Override
+    public void onClose(int paramInt, String paramString, boolean paramBoolean) {
+        // TODO Auto-generated method stub
+        System.out.println("关闭...");
+    }
+
+    @Override
+    public void onError(Exception e) {
+        // TODO Auto-generated method stub
+        System.out.println("异常"+e);
+
+    }
+}

+ 47 - 0
src/main/java/com/goafanti/common/webSocket/WebClientEnum.java

@@ -0,0 +1,47 @@
+package com.goafanti.common.webSocket;
+
+
+import org.apache.commons.lang3.ObjectUtils;
+import org.java_websocket.WebSocket;
+import org.java_websocket.enums.ReadyState;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+
+
+public enum WebClientEnum {
+
+    CLIENT;
+
+    private static MsgWebSocketClient socketClient = null;
+
+    public static void initClient(MsgWebSocketClient client) {
+        socketClient = client;
+        if(socketClient!=null) {
+            socketClient.connect();
+            while (socketClient.getReadyState().equals(ReadyState.OPEN)){
+                socketClient.send("测试websocket。。。");
+            }
+
+        }
+        boolean flag = true;
+        int i=1000;
+        while(flag) {
+            while (!socketClient.getReadyState().equals(ReadyState.OPEN)){
+
+            }
+            socketClient.send("测试websocket。。。"+(i--));
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            if(i == 0) {
+                flag = false;
+            }
+        }
+    }
+
+}

+ 5 - 2
src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java

@@ -11,7 +11,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 
 /**
- * 
+ *
  * @author xiaolong
  *
  */
@@ -52,6 +52,9 @@ public class JDBCIdGenerator {
 
 	static void initWorkerId() {
 		String workerId = System.getProperty("jdbc.worker.id");
+		if (StringUtils.isBlank(workerId)) {
+            workerId="100";
+        }
 		if (StringUtils.isNoneBlank(workerId)) {
 			setWorkerId(Long.valueOf(workerId));
 			return;
@@ -108,4 +111,4 @@ public class JDBCIdGenerator {
 		}
 		return time;
 	}
-}
+}

+ 5 - 1
src/main/java/com/goafanti/core/websocket/SystemWebSocketHandler.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.goafanti.common.webSocket.MsgWebSocketClient;
+import org.java_websocket.client.WebSocketClient;
 import org.springframework.web.socket.CloseStatus;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketHandler;
@@ -27,7 +29,9 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 
 	@Override
 	public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) throws Exception {
+//		收到消息
 		LoggerUtils.debug(getClass(), message.getPayload().toString());
+
 	}
 
 	@Override
@@ -84,4 +88,4 @@ public class SystemWebSocketHandler implements WebSocketHandler {
 			}
 		}
 	}
-}
+}

+ 5 - 1
src/main/java/com/goafanti/core/websocket/WebSocketHandshakeInterceptor.java

@@ -24,6 +24,10 @@ public class WebSocketHandshakeInterceptor implements HandshakeInterceptor {
 				// 使用TokenManager.getUserId区分WebSocketHandler,以便定向发送消息
 				attributes.put(Constants.WEBSOCKET_USERNAME, TokenManager.getUserId());
 				return true;
+			}else {
+				//非登录用户
+				attributes.put(Constants.WEBSOCKET_USERNAME, 10086l);
+				return true;
 			}
 		}
 		return false;
@@ -34,4 +38,4 @@ public class WebSocketHandshakeInterceptor implements HandshakeInterceptor {
 			Exception exception) {
 
 	}
-}
+}

+ 3 - 3
src/main/java/com/goafanti/easemob/queue/EasemobRedisQueueListener.java

@@ -6,13 +6,13 @@ import com.goafanti.easemob.EasemobUtils;
 import com.goafanti.easemob.bo.EasemobInfo;
 
 public class EasemobRedisQueueListener implements RedisQueueListener<EasemobInfo> {
-	@Autowired
-	private EasemobUtils easemobUtils;
+//	@Autowired
+//	private EasemobUtils easemobUtils;
 
 	@Override
 	public void onMessage(EasemobInfo value) {
 		if (value.getTryCount() < 3) {
-			easemobUtils.sendAsync(value);
+//			easemobUtils.sendAsync(value);
 		}
 	}
 

+ 3 - 3
src/main/java/com/goafanti/message/queue/MessageRedisQueueListener.java

@@ -7,13 +7,13 @@ import com.goafanti.message.bo.MessageAdapter;
 
 
 public class MessageRedisQueueListener implements RedisQueueListener<MessageAdapter>{
-	@Autowired
-	JGMessageHelper jgMessageHelper;
+//	@Autowired
+//	JGMessageHelper jgMessageHelper;
 
 	@Override
 	public void onMessage(MessageAdapter messageAdapter) {
 		if (messageAdapter.getTryCount() < 3) {
-			jgMessageHelper.send(messageAdapter);
+//			jgMessageHelper.send(messageAdapter);
 		}
 	}
 

+ 8 - 8
src/main/java/com/goafanti/message/service/impl/JtMessageProducerServiceImpl.java

@@ -40,13 +40,13 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 	private AdminMapper adminMapper;
 	@Autowired
 	private JtMessageConsumerMapper jtMessageConsumerMapper;
-	@Autowired
-	private JGMessageHelper jgMessageHelper;
+//	@Autowired
+//	private JGMessageHelper jgMessageHelper;
 	@Value(value = "${accessKey}")
 	private String					accessKey			= null;
 	@Value(value = "${accessSecret}")
 	private String					accessSecret		= null;
-	
+
 
 	@Override
 	public int addMessage(JtMessageProducer messageProducer) {
@@ -69,7 +69,7 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 		}
 		return jtMessageProducerMapper.insertSelective(messageProducer);
 	}
-	
+
 	@Override
 	public int addSendMessage(String messageId) {
 		// 获得所有正常使用的注册用户
@@ -90,12 +90,12 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 		if (producer!=null) {
 			if (producer.getSubject()==1) {
 				//推送消息
-				jgMessageHelper.sendPushMessage(producer);
+//				jgMessageHelper.sendPushMessage(producer);
 			}
 		}
 		return jtMessageConsumerMapper.addBatch(list);
 	}
-	
+
 
 	@Override
 	public JtMessageProducer getMessageById(String messageId) {
@@ -121,7 +121,7 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 	public Pagination<JtMessageProducer> getMessageList(JtMessageProducer messageProducer, String sendStartTime, String sendEndTime,
 			String messageCode,Integer subject,Integer pageNo,Integer pageSize){
 		if(pageNo==null || pageNo<1)pageNo=1;
-		if(pageSize==null ||pageSize<1)pageSize=10; 
+		if(pageSize==null ||pageSize<1)pageSize=10;
 		Map<String, Object> params=new HashMap<String,Object>();
 		//params.put("create", TokenManager.getUserId());
 		if(StringUtils.isNotBlank(messageProducer.getTitle()))params.put("title",messageProducer.getTitle());
@@ -165,7 +165,7 @@ public class JtMessageProducerServiceImpl  extends BaseMybatisDao<JtMessageProdu
 		producer.setSendTime(new Date());
 		jtMessageProducerMapper.insertSelective(producer);
 		return 1;
-		
+
 	}
 
 

+ 21 - 21
src/main/java/com/goafanti/message/service/impl/MessageServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.goafanti.message.JGMessageHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,6 @@ import com.goafanti.common.model.User;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.message.JGMessageHelper;
 import com.goafanti.message.bo.AppMessageBo;
 import com.goafanti.message.bo.MessageBo;
 import com.goafanti.message.bo.MessageListBo;
@@ -47,9 +47,9 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	private MessageProducerMapper messageProducerMapper;
 	@Autowired
 	private JpushEasemobAccountMapper jpushEasemobAccountMapper;
-	@Autowired
-	private JGMessageHelper jgMessageHelper;
-	
+//	@Autowired
+//	private JGMessageHelper jgMessageHelper;
+
 	@Autowired
 	private JtMessageProducerMapper jtMessageProducerMapper;
 	@Autowired
@@ -63,7 +63,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		}else if(selectMap.containsKey(ConsumerType.USER_RETAIL.getTypeCode())){
 			return selectMap.get(ConsumerType.USER_RETAIL.getTypeCode()); //用户散户
 		}else if(selectMap.containsKey(ConsumerType.SOCIETY_TAG.getTypeCode())){ // 社会标签
-			String sql  = "select group_concat(id) from user where source=0 and status != 2 and society_tag in("+ selectMap.get(ConsumerType.SOCIETY_TAG.getTypeCode()) +")";		
+			String sql  = "select group_concat(id) from user where source=0 and status != 2 and society_tag in("+ selectMap.get(ConsumerType.SOCIETY_TAG.getTypeCode()) +")";
 			return messageFromSystemMapper.selectSendTarget(sql);
 		}else if(selectMap.containsKey(ConsumerType.LOCATION.getTypeCode())){ //用户地区
 			String sql = "";
@@ -113,7 +113,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	@Override
 	public String selectSendAdmin(Map<Integer, String> selectMap,Integer type) {
 		String sql = "";
-		if(selectMap.containsKey(ConsumerType.COMPANY.getTypeCode())){			
+		if(selectMap.containsKey(ConsumerType.COMPANY.getTypeCode())){
 			sql = "select group_concat(id) from admin where department_id in ("+ changeSql(selectMap.get(ConsumerType.COMPANY.getTypeCode())) + ")";
 		}else if(selectMap.containsKey(ConsumerType.ROLE.getTypeCode())){
 			sql = "select group_concat(id) from admin a left join user_role b on a.id = b.uid where b.rid in (" + changeSql(selectMap.get(ConsumerType.ROLE.getTypeCode())) + ")";
@@ -143,10 +143,10 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		if(!sql.equals("")) return messageFromSystemMapper.selectRecommendTarget(sql);
 		return null;
 	}
-	
+
 	@Override
 	@Transactional
-	public int insertSystemMessage(Map<Integer, String> targetMap, Integer targetType,String title, String body, 
+	public int insertSystemMessage(Map<Integer, String> targetMap, Integer targetType,String title, String body,
 			Integer subject,Date createTime,Integer isDraft) {
 		MessageFromSystem mfs = new MessageFromSystem();
 		mfs.setId(UUID.randomUUID().toString());
@@ -217,14 +217,14 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 						sendTarget.add(bo);
 					}
 				}
-			}			
+			}
 		}
 		if(producerTarget.size()>0) insertBatchProducer(producerTarget);
 		//推送消息
-		if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
+//		if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 		return 1;
 	}
-	
+
 	@Override
 	@Transactional
 	public int insertRecommendMessage(Map<Integer, String> sourceMap, Integer sourceType, Map<Integer, String> targetMap,
@@ -239,7 +239,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 				message = new MessageFromSystem();
 				String messageId = "";
 				Date createTime = new Date();
-				message.setCreateTime(createTime);	
+				message.setCreateTime(createTime);
 				message.setSubject(subject);
 				message.setConsumerType(getTargetType(targetType)); //适配客户类型
 				message.setResourceType(getSourceType(sourceType)); //适配成果需求
@@ -292,17 +292,17 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 			if(messageTarget.size()>0) messageFromSystemMapper.insertBatchMessage(messageTarget);
 			if(producerTarget.size()>0) messageFromSystemMapper.insertBatchProducer(producerTarget);
 			//推送消息
-			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
+//			if(sendTarget.size()>0) jgMessageHelper.sendSystemMessage(sendTarget);
 			return 1;
 		}
 		return 0;
 	}
-	
+
 	@Override
 	public List<MessageBo> selectSyncMessage(String uid) {
 		return messageFromSystemMapper.selectSyncMessage(uid);
 	}
-	
+
 	@Override
 	public int updateMessageProducer(List<MessageProducer> producerList){
 		for(MessageProducer mp : producerList){
@@ -310,12 +310,12 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		}
 		return 1;
 	}
-	
+
 	@Override
 	public int insertBatchProducer(List<MessageProducer> target){
 		return messageFromSystemMapper.insertBatchProducer(target);
 	}
-	
+
 	@Override
 	public int insertBatchConsumer(List<MessageConsumer> target) {
 		return messageFromSystemMapper.insertBatchConsumer(target);
@@ -385,14 +385,14 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	public MessageFromSystem selectSystemMessageDetail(String messageId) {
 		return messageFromSystemMapper.selectByPrimaryKey(messageId);
 	}
-	
+
 	/**
 	 * 为个人和组织做转换
 	 * @param sourceType
 	 * @return
 	 */
 	private Integer getSourceType(Integer sourceType){
-		if(RecommendType.PERSON_ACHIEVEMENT.getTypeCode() == sourceType 
+		if(RecommendType.PERSON_ACHIEVEMENT.getTypeCode() == sourceType
 				|| RecommendType.ORGANIZATION_ACHIEVEMENT.getTypeCode() == sourceType){
 			sourceType = RecommendType.ACHIEVEMENT.getTypeCode();
 		}else if(RecommendType.PERSONAL_DEMAND.getTypeCode() == sourceType
@@ -418,7 +418,7 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 	public JpushEasemobAccount selectSynAccByUid(String uid) {
 		return jpushEasemobAccountMapper.selectSynAccByUid(uid);
 	}
-	
+
 	private String changeSql(String source){
 		String result = "";
 		if(StringUtils.isNotBlank(source)){
@@ -469,6 +469,6 @@ public class MessageServiceImpl  extends BaseMybatisDao<MessageFromSystemMapper>
 		return i;
 	}
 
-	
+
 
 }

+ 58 - 58
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -86,9 +86,9 @@ public class UserApiController extends BaseApiController {
 	private OrganizationTechService			organizationTechService;
 	@Resource
 	private UserContactService 				userContactService;
-	@Autowired
-	private EasemobUtils					easemobUtils;
-	
+//	@Autowired
+//	private EasemobUtils					easemobUtils;
+
 	@Resource
 	private JtBusinessService	jtBusinessService;
 
@@ -108,7 +108,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 修改密码
-	 * 
+	 *
 	 * @param password
 	 * @param newPassword
 	 * @return
@@ -141,7 +141,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 更换手机
-	 * 
+	 *
 	 * @param mobile
 	 * @param mobileCode
 	 * @return
@@ -184,11 +184,11 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 
-	
+
 
 	/**
 	 * 公共
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -211,7 +211,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 认证
-	 * 
+	 *
 	 * @param req
 	 * @return
 	 */
@@ -224,7 +224,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人资料
-	 * 
+	 *
 	 * @param userInfoBo
 	 * @param bindingResult
 	 * @return
@@ -232,13 +232,13 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/userInfo", method = RequestMethod.POST)
 	public Result personalData(BindingResult bindingResult) {
 		Result res = new Result();
-		
+
 		return res;
 	}
 
 	/**
 	 * 个人会员教育信息
-	 * 
+	 *
 	 * @param userEdu
 	 * @return
 	 */
@@ -271,7 +271,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人会员职业信息
-	 * 
+	 *
 	 * @param userCareer
 	 * @return
 	 */
@@ -304,7 +304,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 会员能力标签
-	 * 
+	 *
 	 * @param userAbility
 	 * @return
 	 */
@@ -337,7 +337,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 团体会员单位资料
-	 * 
+	 *
 	 * @param orgInfo
 	 * @return
 	 */
@@ -359,7 +359,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 团体会员技术能力
-	 * 
+	 *
 	 * @param orgTech
 	 * @return
 	 */
@@ -389,7 +389,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人会员基本信息
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/getUserDetail", method = RequestMethod.GET)
@@ -398,10 +398,10 @@ public class UserApiController extends BaseApiController {
 		res.setData(userIdentityService.selectUserIdentityBoByUserId(TokenManager.getUserId()));
 		return res;
 	}
-	
+
 	/**
 	 * 个人会员基本信息
-	 * 
+	 *
 	 * @param userIdentity
 	 * @param bindingResult
 	 * @return
@@ -440,10 +440,10 @@ public class UserApiController extends BaseApiController {
 		res.setData(userIdentity);
 		return res;
 	}
-	
+
 	/**
 	 * 更新专家信息
-	 * 
+	 *
 	 * @param userIdentity
 	 * @param bindingResult
 	 * @return
@@ -488,12 +488,12 @@ public class UserApiController extends BaseApiController {
 			}
 			user.setId(TokenManager.getUserId());
 			userService.updateByPrimaryKeySelective(user);
-			
+
 		}
 		res.setData(userIdentity);
 		return res;
 	}
-	
+
 	/**
 	 * 企业信息详情
 	 * @return
@@ -505,10 +505,10 @@ public class UserApiController extends BaseApiController {
 		res.setData(o);
 		return res;
 	}
-	
+
 	/**
 	 * 修改企业信息
-	 * 
+	 *
 	 * @param userIdentity
 	 * @param bindingResult
 	 * @return
@@ -525,9 +525,9 @@ public class UserApiController extends BaseApiController {
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
-		
+
 		if (res.getError().isEmpty()) {
-			
+
 			OrganizationIdentity oi = new OrganizationIdentity();
 			User user = new User();
 			BeanUtils.copyProperties(organizationIdentity, oi);
@@ -561,27 +561,27 @@ public class UserApiController extends BaseApiController {
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getIdentifyName())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "单位名称", "单位名称"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "单位名称", "单位名称"));
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getCompanyLogoUrl())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "LOGO", "LOGO"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "LOGO", "LOGO"));
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getBusinessScope())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "业务范围", "业务范围"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "业务范围", "业务范围"));
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getIntroduction())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业简介", "企业简介"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业简介", "企业简介"));
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getHonorPicture())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "荣誉资质", "荣誉资质"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "荣誉资质", "荣誉资质"));
 			return res;
 		}
 		if(StringUtils.isBlank(organizationIdentity.getEmail())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业邮箱", "企业邮箱"));			
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "企业邮箱", "企业邮箱"));
 			return res;
 		}
 		/*if(null==organizationIdentity.getLicenceProvince()||null==organizationIdentity.getLicenceCity()) {
@@ -598,20 +598,20 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 个人资料/团体会员资料
 	 */
 	@RequestMapping(value = "/member", method = RequestMethod.GET)
 	public Result member() {
 		Result res = new Result();
-		
+
 		return res;
 	}
 
 	/**
 	 * 个人会员教育信息
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/educate", method = RequestMethod.GET)
@@ -624,7 +624,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人会员职业信息/团体会员技术能力
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/job", method = RequestMethod.GET)
@@ -642,7 +642,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人/团体能力标签
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/ability", method = RequestMethod.GET)
@@ -655,7 +655,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 获取昵称
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/nickname", method = RequestMethod.GET)
@@ -667,7 +667,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 首页
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/homePage", method = RequestMethod.GET)
@@ -677,7 +677,7 @@ public class UserApiController extends BaseApiController {
 		return res;
 
 	}
-	
+
 	/**
 	 * 用户基本信息
 	 * @return
@@ -708,8 +708,8 @@ public class UserApiController extends BaseApiController {
 		user.setIdentifyName(identifyName);
 		if(StringUtils.isNotEmpty(mobile)){
 			//验证手机号码格式是否正确
-			Pattern p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号           
-			Matcher m = p.matcher(mobile);   
+			Pattern p = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); // 验证手机号
+			Matcher m = p.matcher(mobile);
 			if(!m.matches()){
 				res.getError().add(buildError("电话号码格式不对","电话号码格式不对"));
 			}else{
@@ -731,11 +731,11 @@ public class UserApiController extends BaseApiController {
 		userService.updateByPrimaryKeySelective(user);
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 登陆后返回用户基本信息
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/afterSignIn", method = RequestMethod.GET)
@@ -750,7 +750,7 @@ public class UserApiController extends BaseApiController {
 
 	/**
 	 * 个人实名认证流程入口
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/userPro", method = RequestMethod.GET)
@@ -870,7 +870,7 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 新增客户联系人
 	 * @param bo
@@ -890,7 +890,7 @@ public class UserApiController extends BaseApiController {
 		userContactService.insertSelective(bo);
 		return res;
 	}
-	
+
 	/**
 	 * 修改客户联系人
 	 * @param bo
@@ -910,7 +910,7 @@ public class UserApiController extends BaseApiController {
 		userContactService.updateByPrimaryKeySelective(bo);
 		return res;
 	}
-	
+
 	/**
 	 * 删除客户联系人
 	 * @param id
@@ -926,7 +926,7 @@ public class UserApiController extends BaseApiController {
 		userContactService.deleteUserContact(id);
 		return res;
 	}
-	
+
 	/**
 	 * 获取用户联系人
 	 * @return
@@ -937,7 +937,7 @@ public class UserApiController extends BaseApiController {
 		res.setData(userContactService.selectContactByUid(TokenManager.getUserId()));
 		return res;
 	}
-	
+
     /**
      * 图片上传
      */
@@ -952,7 +952,7 @@ public class UserApiController extends BaseApiController {
         }
         return res;
     }
-    
+
 	@RequestMapping(value = "/uploadHonerPicture", method = RequestMethod.POST)
 	public Result uploadHonerPicture(HttpServletRequest req, String sign) {
 		Result res = new Result();
@@ -966,9 +966,9 @@ public class UserApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
 	/**
-	 *	顾问专家审核列表 
+	 *	顾问专家审核列表
 	 * @return
 	 */
 	@RequestMapping(value = "/customerAuditList", method = RequestMethod.GET)
@@ -978,7 +978,7 @@ public class UserApiController extends BaseApiController {
 		return res;
 	}
 	/**
-	 *	顾问专家审核 
+	 *	顾问专家审核
 	 * @return
 	 */
 	@RequestMapping(value = "/customerAudit", method = RequestMethod.GET)
@@ -987,7 +987,7 @@ public class UserApiController extends BaseApiController {
 		//res.setData(userIdentityService.selectCustomerAuditList(name,type,identity,pageNo,pageSize));
 		return res;
 	}
-	
+
 	/**
 	 * 解码base64位图片
 	 * @param picturebase
@@ -1024,8 +1024,8 @@ public class UserApiController extends BaseApiController {
 		res.data(userService.updateGetInvitationCode(uid));
 		return res;
 	}
-	
-	
+
+
 
 
 }

+ 0 - 13
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -40,19 +40,6 @@ public class UserRegisterController extends BaseController {
 	private UserService		userService;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil	passwordUtil;
-	@Resource
-	private AdminService	adminService;
-	@Resource
-	private MessageService messageService;
-	@Resource
-	private EasemobUtils   easemobUtils;
-	@Resource
-	private JDBCIdGenerator	jDBCIdGenerator;
-	@Resource
-	private	VoucherDetailService	voucherDetailService;
-	@Resource
-	private VoucherService		voucherService;
-	Logger					logger	= Logger.getLogger(UserRegisterController.class);
 
 	/**
 	 * 网站用户注册

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -39,7 +39,7 @@ app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
 static.host=//ss.jishutao.com/client/1.2.11
-#portal.host=//ss.jishutao.com/portal/2.2.22
+portal.host=//ss.jishutao.com/portal/2.2.21
 skjt.host=//ss.jishutao.com/skjt/1.3
 
 
@@ -49,11 +49,11 @@ skjt.host=//ss.jishutao.com/skjt/1.3
 #portal.host=//172.16.0.255:3000/jitao/portal/1.2.18
 portal.host=//172.16.1.187/portal/2.2.22
 
-#avatar.host=//ss.jishutao.com
-#avatar.upload.host=//ss.jishutao.com/upload
+avatar.host=//ss.jishutao.com
+avatar.upload.host=//ss.jishutao.com/upload
 
-avatar.host=//172.16.0.255:3000
-avatar.upload.host=//172.16.0.255:3000/upload
+#avatar.host=//172.16.0.255:3000
+#avatar.upload.host=//172.16.0.255:3000/upload
 
 #百度-技淘百问(文心一言)
 baidu.appID=33967565

+ 2 - 0
src/main/resources/shiro_base_auth.ini

@@ -16,6 +16,8 @@
 /managesignin=anon
 /register=anon
 /mregister=anon
+/webSocketServer=anon
+/sockjs/webSocketServer=anon
 /open/**=anon
 /favicon.ico=anon
 /static/**=anon

+ 19 - 16
src/main/resources/spring/spring-shiro.xml

@@ -63,26 +63,29 @@
 		<property name="expire" value="2592000" />
 	</bean>
 
-	<!-- 环信 -->
-    <bean id="jedisQueueListener" class="com.goafanti.easemob.queue.EasemobRedisQueueListener"/>
-    <bean id="jedisQueue" class="com.goafanti.easemob.queue.EasemobRedisQueue" destroy-method="destroy">
-        <property name="redisTemplate" ref="redisTemplate"></property>
-        <property name="key" value="easemob:queue"></property>
-        <property name="listener" ref="jedisQueueListener"></property>
-    </bean>
-	<bean id="HttpUtils" class="com.goafanti.common.utils.HttpUtils"/>
+	<!--文心一言-->
 	<bean id="BaiduChatUtils" class="com.goafanti.common.utils.BaiduChatUtils"/>
-    <bean id="easemobUtils" class="com.goafanti.easemob.EasemobUtils"/>
+
+	<!-- 环信 -->
+<!--    <bean id="jedisQueueListener" class="com.goafanti.easemob.queue.EasemobRedisQueueListener"/>-->
+<!--    <bean id="jedisQueue" class="com.goafanti.easemob.queue.EasemobRedisQueue" destroy-method="destroy">-->
+<!--        <property name="redisTemplate" ref="redisTemplate"></property>-->
+<!--        <property name="key" value="easemob:queue"></property>-->
+<!--        <property name="listener" ref="jedisQueueListener"></property>-->
+<!--    </bean>-->
+<!--	<bean id="HttpUtils" class="com.goafanti.common.utils.HttpUtils"/>-->
+<!--    <bean id="easemobUtils" class="com.goafanti.easemob.EasemobUtils"/>-->
+
 
 
 	<!-- 极光 -->
-    <bean id="messageQueueListener" class="com.goafanti.message.queue.MessageRedisQueueListener"/>
-    <bean id="messageQueue" class="com.goafanti.message.queue.MessageRedisQueue" destroy-method="destroy">
-        <property name="redisTemplate" ref="redisTemplate"></property>
-        <property name="key" value="jgpush:queue"></property>
-        <property name="listener" ref="messageQueueListener"></property>
-    </bean>
-    <bean id="jgMessageHelper" class="com.goafanti.message.JGMessageHelper"/>
+<!--    <bean id="messageQueueListener" class="com.goafanti.message.queue.MessageRedisQueueListener"/>-->
+<!--    <bean id="messageQueue" class="com.goafanti.message.queue.MessageRedisQueue" destroy-method="destroy">-->
+<!--        <property name="redisTemplate" ref="redisTemplate"></property>-->
+<!--        <property name="key" value="jgpush:queue"></property>-->
+<!--        <property name="listener" ref="messageQueueListener"></property>-->
+<!--    </bean>-->
+<!--    <bean id="jgMessageHelper" class="com.goafanti.message.JGMessageHelper"/>-->
 
 	<bean id="sessionIdGenerator"
 		class="org.apache.shiro.session.mgt.eis.JavaUuidSessionIdGenerator" />