|
@@ -26,12 +26,14 @@ import org.hibernate.loader.custom.Return;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.core.userdetails.UserDetails;
|
|
import org.springframework.security.core.userdetails.UserDetails;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
+import org.springframework.ui.ModelMap;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
|
|
import java.lang.reflect.Array;
|
|
import java.lang.reflect.Array;
|
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class EnterpriseServiceImpl implements EnterpriseService{
|
|
public class EnterpriseServiceImpl implements EnterpriseService{
|
|
@@ -189,19 +191,23 @@ public class EnterpriseServiceImpl implements EnterpriseService{
|
|
|
detail.setTags(null);
|
|
detail.setTags(null);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- String result = null;
|
|
|
|
|
|
|
+ UserSpaceView userSpaceView = null;
|
|
|
try {
|
|
try {
|
|
|
JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
|
|
JSONObject data = JSON.parseObject(JSON.toJSONString(detail));
|
|
|
String userSpa = data.toJSONString();
|
|
String userSpa = data.toJSONString();
|
|
|
- AccountUtils.register(detail,userView);
|
|
|
|
|
|
|
+ userSpaceView = AccountUtils.register(detail, userView);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, e.getMessage());
|
|
|
}
|
|
}
|
|
|
- if (result.contains("errMsg") || !result.contains("enuu")) {
|
|
|
|
|
|
|
+ /* if (result.contains("errMsg") || !result.contains("enuu")) {
|
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
return new ResultMap(CodeType.SYSTEM_ERROR, "注册失败");
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
|
|
+ ModelMap data = new ModelMap("success", true);
|
|
|
|
|
|
|
|
- return ResultMap.success(JSONObject.parseObject(result));
|
|
|
|
|
|
|
+ /* UserSpaceDetail userSpaceDetail = new UserSpaceDetail();
|
|
|
|
|
+ userSpaceDetail.set*/
|
|
|
|
|
+ data.put("enuu", userSpaceView.getSpaceUU());
|
|
|
|
|
+ return ResultMap.success(data);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|