创建应用管理首页

sso-manage-console-web/package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "bootstrap": "3",
+    "font-awesome": "^4.7.0",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"

sso-manage-console-web/src/App.vue

@@ -18,5 +18,7 @@ export default {
 </script>
 
 <style>
-
+a:hover, a:visited, a:focus {
+  text-decoration: none;
+}
 </style>

sso-manage-console-web/src/components/HelloWorld.vue

@@ -1,50 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <h2>Essential Links</h2>
-    <ul>
-      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://chat.vuejs.org" target="_blank">Community Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
-      <br>
-      <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
-    </ul>
-    <h2>Ecosystem</h2>
-    <ul>
-      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
-      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
-      <li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
-    </ul>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'HelloWorld',
-  data () {
-    return {
-      msg: 'Welcome to Your Vue.js App'
-    }
-  }
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>

sso-manage-console-web/src/components/Index.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: 'Index'
+}
+</script>
+
+<style scoped>
+
+</style>

sso-manage-console-web/src/components/app/AppHome.vue

@@ -1,6 +1,313 @@
 <template>
-  <div class="hello">
-    <h1>{{ msg }}123</h1>
+  <div class="x-container">
+    <div class="container">
+      <div class="x-content-wrap clearfix" style="margin: 0 -15px">
+        <div class="x-content">
+          <!-- tab切换 start-->
+          <ul class="nav nav-tabs x-nav-tabs x-navbar-right hidden-xs">
+            <li><a data-type="INNER">内部</a></li>
+            <li><a data-type="INNER">外部</a></li>
+            <li class="active"><a data-type="">全部</a></li>
+
+            <h2 class="hidden-xs">
+              <i class="fa fa-file-text-o"></i> 应用
+            </h2>
+          </ul>
+          <!-- tab切换 end-->
+          <!-- 列表 start -->
+          <div class="x-mod x-list x-list-2x x-chunk-list-wrap">
+            <div class="x-mod-body">
+              <!-- tab start -->
+              <div id="app_list" class="x-chunk-list">
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="b2b">优软平台</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>b2b</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="cities">智慧产城</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>cities</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="city">产城管理</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>city</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="diymall">定制商城</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>diymall</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="donate">一元捐</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>donate</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="finance">金融服务</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>finance</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="help">客服中心</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>help</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="home">优软首页</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>home</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="im">UU互联</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>im</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="mall">优软商城</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>mall</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="member">会员中心</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>member</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="pan">优软云盘</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>pan</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="public">公共服务</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>public</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="saas">优企云服</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>saas</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="sso">账户中心</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>sso</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="uas">优软UAS</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>uas</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>110</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="uuzc">优软众创</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>uuzc</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+                <div class="x-item">
+                  <div class="x-icon">
+                    <i class="fa fa-file-o"></i>
+                  </div>
+                  <p class="x-title">
+                    <a class="x-text x-editor-trigger" href="javascript:;" data-id="warehouse">物流仓储</a>
+                  </p>
+                  <div class="text-muted">
+                    <span class="x-text"> <i class="fa fa-fw fa-check-square-o"></i>warehouse</span>
+                  </div>
+                  <div class="x-text-muted">
+                    绑定企业<b>0</b>
+                  </div>
+                </div>
+
+              </div>
+              <!-- tab end -->
+              <!-- empty tag -->
+
+              <!-- new app -->
+
+              <div class="x-item">
+                <div class="x-icon">
+                  <a class="x-editor-trigger" href="javascript:;" title="添加应用"><i class="fa fa-plus"></i></a>
+                </div>
+              </div>
+
+            </div>
+          </div>
+          <!-- 列表 end -->
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -17,18 +324,5 @@ export default {
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
+
 </style>

sso-manage-console-web/src/main.js

@@ -4,6 +4,7 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import 'bootstrap/dist/css/bootstrap.min.css'
+import 'font-awesome/css/font-awesome.min.css'
 import './styles/console.css'
 
 Vue.config.productionTip = false

sso-manage-console-web/src/router/index.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import HelloWorld from '@/components/HelloWorld'
+import Index from '@/components/Index'
 import AppHome from '@/components/app/AppHome'
 import AppList from '@/components/app/AppList'
 import UserSpaceHome from '@/components/userspace/UserSpaceHome'
@@ -15,8 +15,8 @@ export default new Router({
   routes: [
     {
       path: '/',
-      name: 'HelloWorld',
-      component: HelloWorld
+      name: 'Index',
+      component: Index
     },
     {
       path: '/app',

sso-manage-console-web/yarn.lock

@@ -2370,6 +2370,10 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.4"
 
+font-awesome@^4.7.0:
+  version "4.7.0"
+  resolved "http://registry.npm.taobao.org/font-awesome/download/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+
 for-in@^1.0.1:
   version "1.0.2"
   resolved "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/api/UserController.java → sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/UserController.java

@@ -1,4 +1,4 @@
-package com.uas.sso.sso.backend.service.api;
+package com.uas.sso.sso.backend.api;
 
 import com.uas.sso.entity.User;
 import com.uas.sso.sso.backend.service.UserService;

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/AppService.java

@@ -0,0 +1,14 @@
+package com.uas.sso.sso.backend.service;
+
+import com.uas.sso.entity.App;
+import java.util.List;
+
+/**
+ * Abstract class for operations about apps when admin operates.
+ *
+ * @author huxz
+ */
+public interface AppService {
+
+    List<App> findAllApps();
+}

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/AppServiceImpl.java

@@ -0,0 +1,22 @@
+package com.uas.sso.sso.backend.service.impl;
+
+import com.uas.sso.entity.App;
+import com.uas.sso.sso.backend.service.AppService;
+import java.util.List;
+import org.springframework.stereotype.Service;
+
+/**
+ * An implementations of {@code AppService}.
+ *
+ * @author huxz
+ */
+@Service
+public class AppServiceImpl implements AppService {
+
+    private final AppDao appDao;
+
+    @Override
+    public List<App> findAllApps() {
+        return null;
+    }
+}

sso-server/src/main/java/com/uas/sso/entity/App.java

@@ -22,87 +22,87 @@ public class App implements Serializable {
      * 应用唯一标志
      */
     @Id
-    @Column(name = "_uid")
+    @Column(name = "uid_")
     @GeneratedValue
     private String uid;
 
     /**
      * 应用描述（名称）
      */
-    @Column(name = "description")
+    @Column(name = "description", nullable = false)
     private String description;
 
     /**
      * 级联应用，为空时为独立应用
      */
-    @Column(name = "userControl")
+    @Column(name = "user_control")
     private String userControl;
 
     /**
      * 应用首页Url
      */
-    @Column(name = "homePage")
+    @Column(name = "home_page")
     private String homePage;
 
     /**
      * 企业信息回调接口（用于应用同步）
      */
-    @Column(name = "backSpaceUrl")
+    @Column(name = "back_space_url")
     private String backSpaceUrl;
 
     /**
      * 用户信息回调接口（用于应用同步）
      */
-    @Column(name = "backUserUrl")
+    @Column(name = "back_user_url")
     private String backUserUrl;
 
     /**
      * 合作伙伴回调接口（用于应用同步）
      */
-    @Column(name = "backPartnerUrl")
+    @Column(name = "back_partner_url")
     private String backPartnerUrl;
 
     /**
      * 更换企业管理员回调接口（用于同步）
      */
-    @Column(name = "backChangeAdminUrl")
+    @Column(name = "back_change_admin_url")
     private String backChangeAdminUrl;
 
     /**
      * 登录通知接口
      */
-    @Column(name = "loginUrl")
+    @Column(name = "login_url")
     private String loginUrl;
 
     /**
      * 登出通知接口
      */
-    @Column(name = "logoutUrl")
+    @Column(name = "logout_url")
     private String logoutUrl;
 
     /**
      * 公钥，用于跨域认证
      */
-    @Column(name = "publicKey")
+    @Column(name = "public_key")
     private String publicKey;
 
     /**
      * 绑定企业数
      */
-    @Column(name = "usCount")
+    @Column(name = "us_count")
     private String usCount;
 
     /**
      * 是否默认开通
      */
-    @Column(name = "defaultUse")
+    @Column(name = "default_use")
     private String defaultUse;
 
     /**
      * 是否支持个人账号
      */
-    @Column(name = "personalEnable")
-    private String personalEnable;
+    @Column(name = "personal_enable", nullable = false)
+    private int personalEnable;
 
     public String getUid() {
         return uid;
@@ -208,11 +208,11 @@ public class App implements Serializable {
         this.defaultUse = defaultUse;
     }
 
-    public String getPersonalEnable() {
+    public int getPersonalEnable() {
         return personalEnable;
     }
 
-    public void setPersonalEnable(String personalEnable) {
+    public void setPersonalEnable(int personalEnable) {
         this.personalEnable = personalEnable;
     }
 }

sso-server/src/main/java/com/uas/sso/entity/RegisterLog.java

@@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSON;
 import javax.persistence.*;
 
 @Entity
-@Table(name = "sso$register$log")
+@Table(name = "sso$log$register")
 public class RegisterLog extends BaseLog {
 
     /**
@@ -45,7 +45,7 @@ public class RegisterLog extends BaseLog {
     /**
      * 当前步数提交信息详情
      */
-    @Column(name = "msgDetail")
+    @Column(name = "msgDetail", length = 2000)
     private String msgDetail;
 
     /**

sso-server/src/main/java/com/uas/sso/entity/User.java

@@ -23,13 +23,13 @@ public class User implements Serializable {
      * uu号
      */
     @Id
-    @Column(name = "userUU")
+    @Column(name = "useruu")
     private Long userUU;
 
     /**
      * 会员名
      */
-    @Column(name = "vipName", nullable = false)
+    @Column(name = "vip_name", nullable = false)
     private String vipName;
 
     /**
@@ -41,14 +41,14 @@ public class User implements Serializable {
     /**
      * 手机号所属区域（continent or Hongkong）
      */
-    @Column(name = "mobileArea")
+    @Column(name = "mobile_area")
     private String mobileArea;
 
     /**
      * 手机号认证状态
      */
-    @Column(name = "mobileIsValid")
-    private Short mobileIsValid;
+    @Column(name = "mobile_valid_code")
+    private Short mobileValidCode;
 
     /**
      * 用户密码
@@ -59,7 +59,7 @@ public class User implements Serializable {
     /**
      * 用户erp密码
      */
-    @Column(name = "erpPassword")
+    @Column(name = "erp_password")
     private String erpPassword;
 
     /**
@@ -69,69 +69,69 @@ public class User implements Serializable {
     private String salt;
 
     /**
-     * 用户erp密码
+     * 用户注册时间
      */
-    @Column(name = "registerDate")
+    @Column(name = "user_register_date")
     private Timestamp registerDate;
 
     /**
      * 用户邮箱
      */
-    @Column(name = "email")
+    @Column(name = "user_email")
     private String email;
 
     /**
      * 用户邮箱
      */
-    @Column(name = "emailIsValid")
-    private Short emailIsValid;
+    @Column(name = "email_valid_code")
+    private Short emailValidCode;
 
     /**
      * 用户真实姓名
      */
-    @Column(name = "realName")
+    @Column(name = "real_name")
     private String realName;
 
     /**
      * 用户身份证号
      */
-    @Column(name = "idCard")
+    @Column(name = "id_card")
     private String idCard;
 
     /**
      * 用户身份认证状态
      */
-    @Column(name = "identityIsValid")
-    private Short identityIsValid;
+    @Column(name = "identity_valid_code")
+    private Short identityValidCode;
 
     /**
      * 用户注册应用
      */
-    @Column(name = "fromApp")
+    @Column(name = "from_app")
     private String fromApp;
 
     /**
      * 姓
      */
-    @Column(name = "firstName")
+    @Column(name = "first_name")
     private String firstName;
 
     /**
      * 名
      */
-    @Column(name = "lastName")
+    @Column(name = "last_name")
     private String lastName;
 
     /**
      * 微信号（微信扫码授权或微信客户端授权，不用出现在注册页面，预留）
      */
-    @Column(name = "wxOpenid")
+    @Column(name = "wx_openid")
     private String wxOpenid;
 
     /**
      * qq号（qq扫码或qq客户端授权，不用出现在注册页面，预留）
      */
-    @Column(name = "qqNumber")
+    @Column(name = "qq_number")
     private Integer qqNumber;
 
     /**
@@ -143,25 +143,25 @@ public class User implements Serializable {
     /**
      * 籍贯（不用出现在注册页面，预留）
      */
-    @Column(name = "nativePlace")
+    @Column(name = "native_place")
     private String nativePlace;
 
     /**
      * 现在所在国家（不用出现在注册页面，预留）
      */
-    @Column(name = "country")
+    @Column(name = "user_country")
     private String country;
 
     /**
      * 现在所在省份、州、直辖市、行政区（不用出现在注册页面，预留）
      */
-    @Column(name = "province")
+    @Column(name = "user_province")
     private String province;
 
     /**
      * 现在所在城市（不用出现在注册页面，预留）
      */
-    @Column(name = "city")
+    @Column(name = "user_city")
     private String city;
 
     /**
@@ -202,12 +202,12 @@ public class User implements Serializable {
         this.mobileArea = mobileArea;
     }
 
-    public Short getMobileIsValid() {
-        return mobileIsValid;
+    public Short getMobileValidCode() {
+        return mobileValidCode;
     }
 
-    public void setMobileIsValid(Short mobileIsValid) {
-        this.mobileIsValid = mobileIsValid;
+    public void setMobileValidCode(Short mobileValidCode) {
+        this.mobileValidCode = mobileValidCode;
     }
 
     public String getPassword() {
@@ -250,20 +250,20 @@ public class User implements Serializable {
         this.email = email;
     }
 
-    public Short getEmailIsValid() {
-        return emailIsValid;
+    public Short getEmailValidCode() {
+        return emailValidCode;
     }
 
-    public void setEmailIsValid(Short emailIsValid) {
-        this.emailIsValid = emailIsValid;
+    public void setEmailValidCode(Short emailValidCode) {
+        this.emailValidCode = emailValidCode;
     }
 
-    public String getName() {
+    public String getRealName() {
         return realName;
     }
 
-    public void setName(String name) {
-        this.realName = name;
+    public void setRealName(String realName) {
+        this.realName = realName;
     }
 
     public String getIdCard() {
@@ -274,12 +274,12 @@ public class User implements Serializable {
         this.idCard = idCard;
     }
 
-    public Short getIdentityIsValid() {
-        return identityIsValid;
+    public Short getIdentityValidCode() {
+        return identityValidCode;
     }
 
-    public void setIdentityIsValid(Short identityIsValid) {
-        this.identityIsValid = identityIsValid;
+    public void setIdentityValidCode(Short identityValidCode) {
+        this.identityValidCode = identityValidCode;
     }
 
     public String getFromApp() {

sso-server/src/main/java/com/uas/sso/entity/Userspace.java

@@ -3,6 +3,7 @@ package com.uas.sso.entity;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.List;
 
 /**
  * 企业实体
@@ -23,13 +24,13 @@ public class Userspace implements Serializable {
      * 企业uu号
      */
     @Id
-    @Column(name = "spaceUU")
+    @Column(name = "spaceuu")
     private Long spaceUU;
 
     /**
      * 企业名称
      */
-    @Column(name = "spaceName", unique = true)
+    @Column(name = "space_name", unique = true, nullable = false)
     private String spaceName;
 
     /**
@@ -41,88 +42,88 @@ public class Userspace implements Serializable {
     /**
      * 注册日期
      */
-    @Column(name = "registerDate")
+    @Column(name = "space_register_date")
     private Timestamp registerDate;
 
     /**
      * 管理员uu号
      */
-    @Column(name = "adminUU")
+    @Column(name = "adminuu")
     private Long adminUU;
 
     /**
      * 管理员
      */
-    @ManyToOne
-    @JoinColumn(name = "adminUU", insertable=false, updatable=false)
+    @ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH})
+    @JoinColumn(name = "adminuu", insertable=false, updatable=false)
     private User admin;
 
     /**
      * 营业执照号
      */
-    @Column(name = "businessCode")
+    @Column(name = "business_code")
     private String businessCode;
 
     /**
      * 营业执照
      */
-    @Column(name = "businessCodeImage")
+    @Column(name = "business_code_image")
     private String businessCodeImage;
 
     /**
      * 注册地址
      */
-    @Column(name = "regAddress")
+    @Column(name = "reg_address")
     private String regAddress;
 
-    /**
-     * 公司地址
-     */
-    @Column(name = "companyAddress")
-    private String companyAddress;
-
-    /**
-     * 企业信息认证状态
-     */
-    @Column(name = "isValid")
-    private Short isValid;
-
-    /**
-     * logo图片
-     */
-    @Column(name = "logoImage")
-    private String logoImage;
-
     /**
      * 公司地址经度
      */
-    @Column(name = "longitude")
+    @Column(name = "company_longitude")
     private String longitude;
 
     /**
      * 公司地址纬度
      */
-    @Column(name = "latitude")
+    @Column(name = "company_latitude")
     private String latitude;
 
     /**
      * 公司所在国家
      */
-    @Column(name = "country")
+    @Column(name = "company_country")
     private String country;
 
     /**
      * 公司所在省份、州、直辖市、行政区
      */
-    @Column(name = "province")
+    @Column(name = "company_province")
     private String province;
 
     /**
      * 公司所在城市
      */
-    @Column(name = "city")
+    @Column(name = "company_city")
     private String city;
 
+    /**
+     * 公司地址
+     */
+    @Column(name = "company_address")
+    private String companyAddress;
+
+    /**
+     * 企业信息认证状态
+     */
+    @Column(name = "valid_code")
+    private Short validCode;
+
+    /**
+     * logo图片
+     */
+    @Column(name = "logo_image")
+    private String logoImage;
+
     /**
      * 企业联系电话
      */
@@ -132,13 +133,13 @@ public class Userspace implements Serializable {
     /**
      * 主营业务范围
      */
-    @Column(name = "mainBusiness")
+    @Column(name = "main_business")
     private String mainBusiness;
 
     /**
      * 对公银行账户
      */
-    @Column(name = "bankAccount")
+    @Column(name = "bank_account")
     private String bankAccount;
 
     /**
@@ -147,6 +148,21 @@ public class Userspace implements Serializable {
     @Column(name = "bank")
     private String bank;
 
+    /**
+     * 企业域名
+     */
+    @Column(name = "domain")
+    private String domain;
+
+    /**
+     * 企业下的用户
+     */
+    @ManyToMany
+    @JoinTable(name = "sso$user_userspace",
+            joinColumns = {@JoinColumn(name="space_uu", referencedColumnName="spaceuu")},
+            inverseJoinColumns = {@JoinColumn(name="user_uu", referencedColumnName="useruu")})
+    private List<User> users;
+
     public Userspace() {
     }
 
@@ -230,12 +246,12 @@ public class Userspace implements Serializable {
         this.companyAddress = companyAddress;
     }
 
-    public Short getIsValid() {
-        return isValid;
+    public Short getValidCode() {
+        return validCode;
     }
 
-    public void setIsValid(Short isValid) {
-        this.isValid = isValid;
+    public void setValidCode(Short validCode) {
+        this.validCode = validCode;
     }
 
     public String getLogoImage() {
@@ -317,4 +333,20 @@ public class Userspace implements Serializable {
     public void setBank(String bank) {
         this.bank = bank;
     }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    public List<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<User> users) {
+        this.users = users;
+    }
 }