Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

# Conflicts:
#	CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToSysRoleService.java
#	CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -16,7 +16,10 @@ public class Constant {
     public static final String WEB_USER_SESSION = "webUser";
 
     /** 不需要权限的URL身份 **/
-    public static final String ROLE_NONE = "ROLE_NONEUSER";
+    public static final String ROLE_NONEUSER = "ROLE_NONEUSER";
+
+    /** 校验出现问题后的默认身份 **/
+    public static final String ROLE_NONE = "ROLE_NONE";
 
     /** app登陆类型 **/
     public static final String APP_LOGIN_TYPE = "app";

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1540980036" Name="smartCommunity" Objects="619" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1541056830" Name="smartCommunity" Objects="619" Symbols="74" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4713,8 +4713,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o90">
 <a:CreationDate>1540878858</a:CreationDate>
 <a:ModificationDate>1540881753</a:ModificationDate>
-<a:Rect>((-77886,-340), (129,3700))</a:Rect>
-<a:ListOfPoints>((-77486,60),(-571,60),(-571,3300))</a:ListOfPoints>
+<a:Rect>((-85810,5549), (-5449,15284))</a:Rect>
+<a:ListOfPoints>((-85410,5949),(-85410,14584),(-5849,14584))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4752,9 +4752,9 @@ Shadow=0</a:DisplayPreferences>
 </o:ExtendedDependencySymbol>
 <o:ExtendedDependencySymbol Id="o96">
 <a:CreationDate>1540880736</a:CreationDate>
-<a:ModificationDate>1540881758</a:ModificationDate>
-<a:Rect>((-77667,-18610), (-71117,-16761))</a:Rect>
-<a:ListOfPoints>((-77267,-17161),(-75467,-17161),(-75467,-17910),(-71517,-17910))</a:ListOfPoints>
+<a:ModificationDate>1541056830</a:ModificationDate>
+<a:Rect>((-77667,-18910), (-69137,-16761))</a:Rect>
+<a:ListOfPoints>((-77267,-17161),(-75467,-17161),(-75467,-18210),(-69537,-18210))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -5846,9 +5846,9 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:TableSymbol>
 <o:TableSymbol Id="o97">
 <a:CreationDate>1540880446</a:CreationDate>
-<a:ModificationDate>1540881758</a:ModificationDate>
+<a:ModificationDate>1541056830</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-72825,-24751), (-58247,-12851))</a:Rect>
+<a:Rect>((-70845,-25051), (-56267,-13151))</a:Rect>
 <a:AutoAdjustToText>0</a:AutoAdjustToText>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>