Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRspDTO.java

@@ -43,6 +43,16 @@ public class CompanyRspDTO implements Serializable {
 
     private Long adminId;
 
+    private Long adminEmail;
+
+    public Long getAdminEmail() {
+        return adminEmail;
+    }
+
+    public void setAdminEmail(Long adminEmail) {
+        this.adminEmail = adminEmail;
+    }
+
     public String getType() {
         return type;
     }

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -14,7 +14,7 @@
         delete from ac_account_company where company_id=#{companyId}
     </delete>
     <select id="getCompanyListByAccountMobile" resultType="com.usoftchina.saas.account.dto.CompanyRspDTO">
-        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type from ac_company cmp
+        SELECT cmp.id,cmp.name,cmp.uu,cmp.business_code businessCode,cmp.address,accmp.is_default default_,'1' saas_,aci.realname admin,cmp.creator_id adminId,cmp.type,ac.email adminEmail from ac_company cmp
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
         left join ac_account aci on aci.id = cmp.creator_id

frontend/saas-portal-web/config/dev.env.js

@@ -8,11 +8,9 @@ module.exports = merge(prodEnv, {
     // 前端地址
     web: '"http://192.168.0.181"',
     // 后端接口网关
-    // api: '"http://192.168.0.181:8560"',
-    //api:'"http://192.168.253.58:8560"',
-    api: '"https://saas-api.usoftchina.com"',
+    api: '"http://192.168.0.181:8560"',
+    // api:'"http://192.168.253.31:8560"',
     // 账户中心接口
-    // sso: '"http://192.168.253.12:32323"'
-    sso: '"https://sso.ubtob.com"'
+    sso: '"http://192.168.253.12:32323"'
   }
 })

frontend/saas-portal-web/config/index.js

@@ -14,7 +14,7 @@ module.exports = {
 
     // Various Dev Server settings
     // host: 'localhost', // can be overwritten by process.env.HOST
-    host: '192.168.253.183', // can be overwritten by process.env.HOST
+    host: '127.0.0.1', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

frontend/saas-portal-web/src/components/conenter/addgongsi.vue

@@ -69,7 +69,7 @@
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
                         <li style='margin:0'>
                             <span class="qy-biaoti">邮箱</span>
-                            <input class="inpind" @change="email" ref="email" type="email">
+                            <input class="inpind" @change="email" ref="email" type="email" value="">
                             <div class="qy-Tips Tips-buttom"><span style="color:red">{{Email}}</span></div>
                         </li>
                     </ul>

frontend/saas-portal-web/src/components/conenter/company.vue

@@ -107,8 +107,7 @@
         },
         computed :{
             setTokenPage() {
-                return 'http://192.168.253.39/set-token.html'
-                //return this.$url.web + '/set-token.html'
+                return this.$url.web + '/set-token.html'
             }
         },
         watch:{
@@ -151,6 +150,7 @@
                     }
                     this.$store.commit('Loginfalse')
                     // console.log(res.data.data)
+                    this.$store.state.email = this.arr[0].adminEmail
                 })
                 .catch(err=>{
                     // console.log("请求失败",err)
@@ -205,10 +205,8 @@
                     session.account.companyId=id;
                     session.span = session.timestamp - new Date().getTime();
                     session.token=mytoken;
-                    // frame.postMessage(JSON.stringify(session), '*');
-                    // window.location.href = this.$url.web
                     frame.postMessage(JSON.stringify(session), '*');
-                    window.open('http://192.168.253.39:1841/#main','_blank');
+                    window.location.href = this.$url.web
                 })
                 .catch(err=>{
                     // console.log('请求失败',err)
@@ -245,7 +243,7 @@
                 let account = {'realname':name,'email':email,'mobile':mobile, 'uu':uu}
                 // let id = this.saasid;
                 this.$ajax({
-                    url: "http://192.168.253.31:8560/api/account/accountCenter/companyAccount/save",
+                    url: this.$url.api+"/api/account/accountCenter/companyAccount/save",
                     method: 'post',
                     data: {
                         companyRegDTO:company,

frontend/saas-portal-web/src/components/conenter/enterprise.vue

@@ -61,7 +61,7 @@
                                     <span>UU号</span><span>{{mytoken.uu}}</span>
                                 </li>
                                 <li>
-                                    <span>邮箱</span><span>{{mytoken.email}}</span>
+                                    <span>邮箱</span><span>{{email}}</span>
                                 </li>
                                 <li>
                                     <span>手机号</span><span>{{mytoken.mobile}}</span>
@@ -111,6 +111,7 @@ import { setTimeout } from 'timers';
             return{
                 nowindex: 0,//tab切换
                 tianjiaqiye: true,//添加企业切换
+                email: this.$store.state.email,
                 mytoken: JSON.parse(localStorage.getItem('app-state-session')).account,//本地储存的用户信息
                 tab: [
                     {name: '企业信息'},

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -430,8 +430,7 @@
                 session.account = account
                 const frame = window.frames[window.frames.length - 1]
                 frame.postMessage(JSON.stringify(session), '*')
-                // window.location.href = me.$url.web
-                    window.open('http://192.168.253.39:1841/#main','_blank');
+                window.location.href = me.$url.web
                 // console.log("请求成功",res)
                 phone = ''
             })

frontend/saas-portal-web/src/components/conenter/qiyexiangxi.vue

@@ -25,7 +25,7 @@
                     <ul>
                         <li><span class="qy-biaoti">姓名</span><span>{{content.admin}}</span></li>
                         <li><span class="qy-biaoti">手机号</span><span>{{mytoken.account.mobile}}</span></li>
-                        <li><span class="qy-biaoti">邮箱</span><span>{{mytoken.account.email}}</span></li>
+                        <li><span class="qy-biaoti">邮箱</span><span>{{content.adminEmail}}</span></li>
                     </ul>
                 </div>
             </div>
@@ -120,13 +120,15 @@
         },
         methods: {
             selects(){
-                let selects = this.$refs.qyindustry
-                let options = selects.options
+                let selects = this.$refs.qyindustry;
+                let options = selects.options;
                 for (let i = 0; i < options.length; i++) {
                     if (options[i].innerHTML == this.content.type) {
                         options[i].selected = true
                     }
-                }
+                };
+                let email = this.$refs.email;
+                email.value = this.content.adminEmail;
             },
             //修改企业信息
             xiugaiqiye(){
@@ -187,7 +189,8 @@
                         if (res.data.success) {
                             document.documentElement.scrollTop = 0;
                             this.xiugai = true;
-                            this.content.type = qyindustry
+                            this.content.type = qyindustry;
+                            this.content.adminEmail = email
                         };
                     })
                     .catch(err=>{

frontend/saas-portal-web/src/store/index.js

@@ -5,6 +5,7 @@ Vue.use(Vuex)
 export default new Vuex.Store({
     state:{
         data: [],
+        email:'',
         isAutoLogin: false,
     },
     mutations:{