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

base-servers/account/account-api/pom.xml

@@ -29,6 +29,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>auth-common</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/api/AccountApi.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.dto.AccountCopyDTO;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.account.dto.AccountRegDTO;
 import com.usoftchina.saas.account.dto.AccountUpdateDTO;
+import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ShareAddDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -105,4 +106,14 @@ public interface AccountApi {
      */
     @PostMapping("/account/share/join")
     Result shareJoin(@RequestBody ShareAddDTO shareAddDTO);
+
+    /**
+    * @Description 同步优软云密码
+    * @Param: [info]
+    * @return: void
+    * @Author: guq
+    * @Date: 2019/1/4
+    */
+    @PostMapping("/account/updatePassword")
+    Result updatePassword(@RequestBody CookieInfo info);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -11,6 +11,7 @@ import com.usoftchina.saas.account.service.CompanyService;
 import com.usoftchina.saas.account.service.RoleService;
 import com.usoftchina.saas.account.vo.CompanyBaseVO;
 import com.usoftchina.saas.auth.client.annotation.IgnoreAuth;
+import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ShareAddDTO;
@@ -20,13 +21,12 @@ import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.sms.api.SmsApi;
-import com.usoftchina.saas.utils.BeanMapper;
-import com.usoftchina.saas.utils.CollectionUtils;
-import com.usoftchina.saas.utils.ObjectUtils;
-import com.usoftchina.saas.utils.RegexpUtils;
+import com.usoftchina.saas.utils.*;
 import com.usoftchina.sso.api.SsoUserApi;
 import com.usoftchina.sso.api.SsoUserSpaceApi;
 import com.usoftchina.sso.dto.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -57,7 +57,10 @@ public class AccountController {
     private SmsApi smsApi;
 
     private final String msgTemplateCode = "SMS_152288990";
+    private final static String CHECK_OPERATR = "fuzzyCheck";
 
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
     /**
      * 注册
      *
@@ -196,16 +199,30 @@ public class AccountController {
         if (null == account) {
             return Result.error(ExceptionCode.USER_NOT_EXIST);
         }
-
+        if (StringUtils.isEmpty(account.getUu())) {
+            return Result.error(ExceptionCode.USER_NOT_EXISTUU);
+        }
         if (!account.isEnabled()) {
             return Result.error(ExceptionCode.USER_NOT_ENABLE);
         }
 
         boolean checked = accountService.checkPwd(account, password);
         if (!checked) {
-            return Result.error(ExceptionCode.USER_PWD_ERROR);
+            //去优软云检测密码
+            SsoResult ssoResult = ssoUserApi.fuzzyCheck(CHECK_OPERATR, account.getMobile(), password);
+            if (!ssoResult.isError()) {
+                //同步本地密码
+                CookieInfo info = new CookieInfo();
+                info.setUserUU(account.getUu());
+                info.setSalt(String.valueOf(account.getUu()));
+                String encryptedPassword = accountService.getEncryptedPassword(password, String.valueOf(account.getUu()));
+                info.setPassword(encryptedPassword);
+                accountService.updatePassword(info);
+            } else {
+                logger.error(ssoResult.getErrMsg());
+                return Result.error(ExceptionCode.USER_PWD_ERROR);
+            }
         }
-
         return Result.success(getAccountDTO(account));
     }
 
@@ -494,4 +511,18 @@ public class AccountController {
         ResourceCache.current().clear();
         return Result.success();
     }
+
+
+    /**
+    * @Description  同步优软云代码
+    * @Param: [info]
+    * @return: com.usoftchina.saas.base.Result
+    * @Author: guq
+    * @Date: 2019/1/4
+    */
+    @PostMapping("/account/updatePassword")
+    Result updatePassword(@RequestBody CookieInfo info) {
+        accountService.updatePassword(info);
+        return Result.success();
+    }
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/AccountMapper.java

@@ -130,4 +130,8 @@ public interface AccountMapper {
      * @param status
      */
     void updateBindCompanyStatus(@Param("accountId") Long accountId, @Param("companyId") Long companyId, @Param("status") String status);
+
+    Integer checkPassword(@Param("userUU") Long userUU, @Param("salt") String salt, @Param("password") String password);
+
+    void updatePassword(@Param("userUU") Long userUU, @Param("salt") String salt, @Param("password") String password);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountService.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.account.dto.AccountAddDTO;
 import com.usoftchina.saas.account.dto.AccountRoleDTO;
 import com.usoftchina.saas.account.po.Account;
 import com.usoftchina.saas.account.po.RoleResource;
+import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ShareAddDTO;
@@ -217,4 +218,6 @@ public interface AccountService {
      * @param shareAddDTO
      */
     void shareJoin(ShareAddDTO shareAddDTO);
+
+    void updatePassword(CookieInfo info);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountServiceImpl.java

@@ -17,6 +17,7 @@ import com.usoftchina.saas.account.po.RoleResource;
 import com.usoftchina.saas.account.service.AccountService;
 import com.usoftchina.saas.account.service.CompanyService;
 import com.usoftchina.saas.account.service.RoleService;
+import com.usoftchina.saas.auth.common.cookie.CookieInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.dto.ShareAddDTO;
@@ -380,6 +381,17 @@ public class AccountServiceImpl implements AccountService {
         clearCache(account.getId());
     }
 
+    @Override
+    public void updatePassword(CookieInfo info) {
+        if (StringUtils.isEmpty(info) || StringUtils.isEmpty(info.getUserUU())) {
+            return;
+        }
+        Integer count = accountMapper.checkPassword(info.getUserUU(), info.getSalt(), info.getPassword());
+        if (count == 0) {
+            accountMapper.updatePassword(info.getUserUU(), info.getSalt(), info.getPassword());
+        }
+    }
+
     /**
      * 校验短信验证码准确性
      * @param mobile

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

@@ -223,4 +223,12 @@
     <update id="updateBindCompanyStatus">
         UPDATE AC_ACCOUNT_COMPANY SET STATUS = #{status} WHERE ACCOUNT_ID = #{accountId} AND COMPANY_ID = #{companyId}
     </update>
+
+    <select id="checkPassword" resultType="integer">
+        select count(1) from ac_account where uu=#{userUU} and password = #{password} and salt = #{salt}
+    </select>
+
+    <update id="updatePassword" >
+        update ac_account set salt=#{salt}, password=#{password} where uu = #{userUU}
+    </update>
 </mapper>

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -254,6 +254,11 @@ public class AuthController {
                         ServletUtils.writeJsonPMessage(response, callback, false);
                         return;
                     }
+                } else {
+                    logger.info("同步密码: uu{} mobile{} salt{} password{}", info.getUserUU(),
+                            info.getMobile(), info.getSalt(), info.getPassword());
+                    //同步优软云密码
+                    accountApi.updatePassword(info);
                 }
             }
             // TODO

base-servers/auth/sso-api/pom.xml

@@ -27,6 +27,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -68,6 +68,17 @@ public interface SsoUserApi {
     @RequestMapping(params = "_operate=bind", method = RequestMethod.POST)
     String bind(@RequestParam("_operate") String _operate, @RequestParam("appId") String appId, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
 
+
+    /**
+    * @Description
+    * @Param: [_operate, appId, userUU, spaceUU]
+    * @return: java.lang.String
+    * @Author: guq
+    * @Date: 2019/1/4
+    */
+    @RequestMapping(params = "_operate=fuzzyCheck", method = RequestMethod.POST)
+    SsoResult fuzzyCheck(@RequestParam("_operate") String _operate, @RequestParam("mobile") String mobile, @RequestParam("password") String password);
+
     /**
      * 企业添加未注册用户
      * @param _operate  add
@@ -109,6 +120,11 @@ public interface SsoUserApi {
             return null;
         }
 
+        @Override
+        public SsoResult fuzzyCheck(String _operate, String mobile, String password) {
+            return null;
+        }
+
         @Override
         public SsoResult add(String _operate, String appId, String vipName, String mobile, String password, Long spaceUU) {
             return null;

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/dto/SsoResult.java

@@ -82,4 +82,16 @@ public class SsoResult<T> {
     public void setContent(T content) {
         this.content = content;
     }
+
+    @Override
+    public String toString() {
+        return "SsoResult{" +
+                "success=" + success +
+                ", error=" + error +
+                ", errCode='" + errCode + '\'' +
+                ", errMsg='" + errMsg + '\'' +
+                ", errDetail='" + errDetail + '\'' +
+                ", content=" + content +
+                '}';
+    }
 }

base-servers/auth/sso-api/src/test/java/com/usoftchina/sso/test/SsoUserApiTest.java

@@ -35,13 +35,13 @@ public class SsoUserApiTest {
         }
     }
 
-    @Test
+    /*@Test
     public void testB_getUserSpacesByMobile() {
         SsoUserSpaceList list = ssoUserApi.getUserSpacesByMobile(mobile);
         if (null != list && !CollectionUtils.isEmpty(list.getSpaces())) {
             list.getSpaces().forEach(space -> System.out.println(space.getSpaceName()));
         }
-    }
+    }*/
 
     @Test
     public void testC_checkMobile(){
@@ -71,4 +71,10 @@ public class SsoUserApiTest {
         SsoResult result = ssoUserApi.add("add", "sp","陈炜","18702604854","123456",10050513L);
         System.out.println(result);
     }
+
+    @Test
+    public void testH_fuzzyCheck(){
+        SsoResult result = ssoUserApi.fuzzyCheck("fuzzyCheck", "13267166319","lect123456");
+        System.out.println(result);
+    }
 }

base-servers/auth/sso-api/src/test/resources/application.yml

@@ -1,3 +1,7 @@
 sso:
   base-url: https://test-sso.uuzcc.cn
-#  base-url: https://sso.ubtob.com
+#  base-url: https://sso.ubtob.com
+spring:
+  redis:
+    host: 10.1.81.62
+    port: 6379

framework/core/src/main/java/com/usoftchina/saas/exception/ExceptionCode.java

@@ -42,6 +42,7 @@ public enum ExceptionCode implements BaseExceptionCode {
     USER_PWD_ERROR(53003, "密码错误"),
     USER_PWD_NOT_EQUALS(53004, "密码与确认密码不一致"),
     USER_NOT_EXIST(53005, "用户不存在"),
+    USER_NOT_EXISTUU(53008, "用户uu不存在"),
     USER_NOT_ENABLE(53006, "用户禁止使用"),
     ROLE_NOT_EXIST(53020, "角色不存在"),
     MISSING_PERMISSIONS(53030, "权限缺失"),

frontend/saas-web/app/view/core/chart/ChartBase.js

@@ -10,13 +10,55 @@ Ext.define('saas.view.core.chart.ChartBase', {
         width: '100%'
     },
 
+    etc: {
+        tools: [{
+            name: 'fullscreen',
+            iconCls: 'x-sa sa-fullscreen',
+            handler: 'fullscreen'
+        }]
+    },
+
     initComponent: function() {
         var me = this;
 
         Ext.apply(me, {
+            title: Ext.create('Ext.panel.Header', {
+                title: me.getTitleHtml(),
+                width: '100%',
+                // listeners: {
+                //     boxready: function() {
+                //         debugger
+                //     }
+                // }
+            }),
             cls: 'quick-graph-panel ' + (me.cls || '')
         });
 
         me.callParent(arguments);
-    }
+    },
+
+    getTitleHtml: function() {
+        var me = this,
+        title = me.title || '',
+        tools = me.chartTools;
+
+        return '<div>' + title + '</div><div class="tools">' + me.getToolStr(tools) + '</div>';
+    },
+
+    getToolStr: function(names) {
+        names = Ext.isArray(names) ? names : [];
+
+        var me = this,
+        tools = me.etc.tools,
+        str = '';
+
+        tools.map(function(t) {
+            if(names.indexOf(t.name) != -1) {
+                str += '<a class="tool ' + t.iconCls + '" onClick=""></a>';
+            }
+        })
+
+        return str;
+    },
+
 });

frontend/saas-web/app/view/core/chart/ChartBase.scss

@@ -6,23 +6,34 @@
         padding: 0;
         margin-top: 20px;
 
-        .x-panel-header-title-default {
-            .x-title-text {
-
-                font-size: 14px;
-                color: #485465;
-                letter-spacing: -0.07px;
-                padding-left: 15px;
-
-                &:before {
-                    content: ' ';
-                    position: absolute;
-                    width: 5px;
-                    height: 16px;
-                    border-radius: 4px;
-                    background: #33B4EE;
-                    left: 4px;
-                    top: 1px;
+        .x-box-inner > .x-box-target > .x-container > .x-box-inner > .x-box-target {
+            &> .x-title {
+                .x-title-text {
+                    display: grid;
+                    grid-template-columns: 1fr 1fr;
+                    font-size: 14px;
+                    color: #485465;
+                    letter-spacing: -0.07px;
+                    padding-left: 15px;
+    
+                    .tools {
+                        text-align: right;
+                
+                        .tool {
+                            cursor: pointer;
+                        }
+                    }
+    
+                    &:before {
+                        content: ' ';
+                        position: absolute;
+                        width: 5px;
+                        height: 16px;
+                        border-radius: 4px;
+                        background: #33B4EE;
+                        left: 4px;
+                        top: 1px;
+                    }
                 }
             }
         }

frontend/saas-web/app/view/home/charts/MonthIO.scss

@@ -1,8 +1,3 @@
-.quick-graph-panel .x-panel-header-default .x-panel-header-title-default > .x-title-text-default {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-}
-
 .x-monthio-legend {
 
     .sumtip {

frontend/saas-web/app/view/home/charts/SaleTrend.scss

@@ -1,8 +1,3 @@
-.quick-graph-panel .x-panel-header-default .x-panel-header-title-default > .x-title-text-default {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-}
-
 .x-saletrend-legend {
 
     .x-legend-inner {

frontend/saas-web/packages/font-saas/resources/fonts/iconfont.svg

@@ -26,6 +26,9 @@ Created by iconfont
     <glyph glyph-name="bar" unicode="&#59412;" d="M1024-67.76470600000005l0-60.235294-1024 0 0 60.235294 1024 0zM120.470588 293.647059l120.470588 0 0-301.176471 60.235294 0 0 361.411765-240.941176 0 0-361.411765 60.235294 0 0 301.176471zM421.647059 474.352941l120.470588 0 0-481.882353 60.235294 0 0 542.117647-240.941176 0 0-542.117647 60.235294 0 0 481.882353zM722.823529 715.294118l120.470588 0 0-722.823529 60.235294 0 0 783.058824-240.941176 0 0-783.058824 60.235294 0 0 722.823529z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="fullscreen" unicode="&#59417;" d="M896 417.28C878.336 417.28 864 431.616 864 449.28L864 695.808 594.624 426.496C582.656 414.528 563.264 414.528 551.296 426.496 539.328 438.464 539.328 457.856 551.296 469.824L818.752 737.28 576 737.28C558.336 737.28 544 751.616 544 769.28 544 786.944 558.336 801.28 576 801.28L893.056 801.28C897.728 801.984 901.568 800.768 906.112 799.232 907.584 798.72 908.992 798.208 910.336 797.504 913.152 796.096 916.48 796.352 918.784 793.984 920.448 792.3199999999999 920.064 789.888 921.28 787.968 924.288 783.936 926.208 779.264 927.04 774.144 927.104 773.248 927.552 772.544 927.488 771.712 927.552 770.88 928 770.112 928 769.28L928 449.28C928 431.616 913.664 417.28 896 417.28ZM205.248 33.27999999999997L448 33.27999999999997C465.664 33.27999999999997 480 18.94399999999996 480 1.2799999999999727 480-16.384000000000015 465.664-30.720000000000027 448-30.720000000000027L130.944-30.720000000000027C126.272-31.423999999999978 122.432-30.20799999999997 117.888-28.672000000000025 116.416-28.159999999999968 115.008-27.648000000000025 113.664-26.94399999999996 110.848-25.535999999999945 107.52-25.79200000000003 105.216-23.423999999999978 103.552-21.75999999999999 103.936-19.327999999999975 102.72-17.408000000000015 99.712-13.375999999999976 97.792-8.70399999999995 96.96-3.5839999999999463 96.896-2.687999999999988 96.448-1.9840000000000373 96.512-1.1520000000000437 96.448-0.32000000000005 96 0.4479999999999791 96 1.2799999999999727L96 321.28C96 338.94399999999996 110.336 353.28 128 353.28 145.664 353.28 160 338.94399999999996 160 321.28L160 74.75199999999995 429.376 344.06399999999996C441.344 356.03200000000004 460.736 356.03200000000004 472.704 344.06399999999996 484.672 332.096 484.672 312.70399999999995 472.704 300.736L205.248 33.27999999999997Z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="invite" unicode="&#59416;" d="M724.89984 293.34528c12.04224-9.56928 31.30368-4.7872 40.9344 9.5744 4.8128 7.18336 4.8128 14.3616 4.8128 21.53984-2.41152 7.17824-7.22432 14.3616-12.04224 19.14368-16.85504 9.5744-33.71008 21.53984-52.97152 28.71808 24.07936 23.936 43.3408 50.25792 55.37792 81.37728 14.4384 33.50016 21.67296 69.4016 21.67296 107.69408 0 148.3776-120.3968 268.04736-269.68576 268.04736S245.71904 707.38432 245.71904 559.00672c0-71.79776 28.89728-138.81344 79.4624-189.07648-156.50816-71.79264-257.6384-227.35872-257.6384-399.67744 0-16.75264 12.03712-28.71808 28.89216-28.71808s28.89216 11.96544 28.89216 28.71808c0 160.34816 101.12512 303.94368 250.4192 358.9888 84.28032-50.24768 192.63488-47.86688 274.49856 0 26.496-9.56416 52.98688-21.53472 74.65472-35.89632z m-211.8912 57.44128c-115.57888 0-209.48992 93.34272-209.48992 208.22016 0 114.87232 93.90592 208.20992 209.48992 208.20992 115.584 0 209.48992-93.3376 209.48992-208.20992 0-28.71808-4.8128-57.4464-16.85504-83.7632-9.63072-23.936-26.49088-45.47584-45.75744-64.61952-38.51776-38.2976-91.49952-59.83744-146.87744-59.83744z m411.71968-221.95712h-95.1296v95.13472a31.70816 31.70816 0 1 1-63.41632 0v-95.13472h-95.13472a31.70816 31.70816 0 0 1 0-63.42144h95.13472v-95.1296a31.71328 31.71328 0 1 1 63.41632 0v95.1296h95.1296a31.70816 31.70816 0 1 1 0 63.42144z"  horiz-adv-x="1024" />
 
     

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,51 +1,105 @@
-
-.sa-home:before { content: "\e817"; }
-
-.sa-bar:before { content: "\e814"; }
-
-.sa-invite:before { content: "\e818"; }
-
-.sa-tuichu:before { content: "\e811"; }
-
-.sa-feedback:before { content: "\e810"; }
-
-.sa-money:before { content: "\e805"; }
-
-.sa-setting:before { content: "\e803"; }
-
-.sa-document:before { content: "\e804"; }
-
-.sa-switch-on:before { content: "\e807"; }
-
-.sa-tag:before { content: "\e815"; }
-
-.sa-edit:before { content: "\e806"; }
-
-.sa-help:before { content: "\e813"; }
-
-.sa-sale:before { content: "\e801"; }
-
-.sa-info:before { content: "\e816"; }
-
-.sa-userBook:before { content: "\e80b"; }
-
-.sa-arrows-left:before { content: "\e809"; }
-
-.sa-purchase:before { content: "\e800"; }
-
-.sa-serviceOnline:before { content: "\e80c"; }
-
-.sa-accountCenter:before { content: "\e812"; }
-
-.sa-date:before { content: "\e80f"; }
-
-.sa-warehouse:before { content: "\e802"; }
-
-.sa-saas:before { content: "\e808"; }
-
-.sa-question:before { content: "\e80d"; }
-
-.sa-arrows-right:before { content: "\e80a"; }
-
-.sa-userGuite:before { content: "\e80e"; }
-
+.sa-home:before {
+    content: "\e817";
+  }
+  
+  .sa-bar:before {
+    content: "\e814";
+  }
+  
+  .sa-fullscreen:before {
+    content: "\e819";
+  }
+  
+  .sa-invite:before {
+    content: "\e818";
+  }
+  
+  .sa-tuichu:before {
+    content: "\e811";
+  }
+  
+  .sa-feedback:before {
+    content: "\e810";
+  }
+  
+  .sa-money:before {
+    content: "\e805";
+  }
+  
+  .sa-setting:before {
+    content: "\e803";
+  }
+  
+  .sa-document:before {
+    content: "\e804";
+  }
+  
+  .sa-switch-on:before {
+    content: "\e807";
+  }
+  
+  .sa-tag:before {
+    content: "\e815";
+  }
+  
+  .sa-edit:before {
+    content: "\e806";
+  }
+  
+  .sa-help:before {
+    content: "\e813";
+  }
+  
+  .sa-sale:before {
+    content: "\e801";
+  }
+  
+  .sa-info:before {
+    content: "\e816";
+  }
+  
+  .sa-userBook:before {
+    content: "\e80b";
+  }
+  
+  .sa-arrows-left:before {
+    content: "\e809";
+  }
+  
+  .sa-purchase:before {
+    content: "\e800";
+  }
+  
+  .sa-serviceOnline:before {
+    content: "\e80c";
+  }
+  
+  .sa-accountCenter:before {
+    content: "\e812";
+  }
+  
+  .sa-date:before {
+    content: "\e80f";
+  }
+  
+  .sa-warehouse:before {
+    content: "\e802";
+  }
+  
+  .sa-saas:before {
+    content: "\e808";
+  }
+  
+  .sa-question:before {
+    content: "\e80d";
+  }
+  
+  .sa-arrows-right:before {
+    content: "\e80a";
+  }
+  
+  .sa-userGuite:before {
+    content: "\e80e";
+  }
+  
+