Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

# Conflicts:
#	.idea/workspace.xml

.gitignore

@@ -0,0 +1,48 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+
+.flattened-pom.xml

.idea/code.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/compiler.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="projects-service" />
-        <module name="projects" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/projects/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/projects/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/jarRepositories.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="local-nexus" />
-      <option name="name" value="local-nexus" />
-      <option name="url" value="http://36.138.74.43:8081/nexus/content/groups/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="spring-snapshots" />
-      <option name="name" value="Spring Snapshots" />
-      <option name="url" value="https://repo.spring.io/libs-snapshot" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>

.idea/misc.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$/projects" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/projects-service/pom.xml" />
-        <option value="$PROJECT_DIR$/projects/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="branchUrls">
-                <list>
-                  <option value="https://36.138.74.43:5236/svn/xjzdprojects/202409branches" />
-                  <option value="https://36.138.74.43:5236/svn/xjzdprojects/branches" />
-                  <option value="https://36.138.74.43:5236/svn/xjzdprojects/tags" />
-                </list>
-              </option>
-              <option name="trunkUrl" value="https://36.138.74.43:5236/svn/xjzdprojects/trunk" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/modules.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
-      <module fileurl="file://$PROJECT_DIR$/projects/projects.iml" filepath="$PROJECT_DIR$/projects/projects.iml" />
-      <module fileurl="file://$PROJECT_DIR$/projects-service/projects-service.iml" filepath="$PROJECT_DIR$/projects-service/projects-service.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/subject_gxj.iml" filepath="$PROJECT_DIR$/.idea/subject_gxj.iml" />
     </modules>
   </component>
 </project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

projects-service/target/classes/com/rtrh/projects/modules/account/po/CommLogin.hbm.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.account.po">
-    <class name="CommLogin" table="comm_login">
-        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-        <property column="loginname" name="loginname" not-null="false" type="java.lang.String" />
-        <property column="ip" name="ip" not-null="false" type="java.lang.String" />
-        <property column="city" name="city" not-null="false" type="java.lang.String" />
-        <property column="ua" name="ua" not-null="false" type="java.lang.String" />
-        <property column="status" name="status" not-null="false" type="java.lang.Boolean" />
-        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-    </class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/account/po/CommUser.hbm.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.account.po">
-    <class name="CommUser" table="comm_user">
-        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-        <property column="login_name" name="loginname" not-null="false" type="java.lang.String" />
-        <property column="password" name="password" not-null="false" type="java.lang.String" />
-        <property column="salt" name="salt" not-null="false" type="java.lang.String" />
-        <property column="enabled" name="enabled" not-null="false" type="java.lang.Integer" />
-        <property column="locked" name="locked" not-null="false" type="java.lang.Integer" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
-       <!--  <property column="password_change_time" name="passwordChangeTime" not-null="false" type="java.util.Date" /> -->
-    </class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/email/po/EmailSendRecord.hbm.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.email.po">
-	<class name="EmailSendRecord" table="email_send_record">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="email" name="email" not-null="false" type="java.lang.String" />
-		<property column="send_time" name="sendTime" not-null="false" type="java.util.Date" />
-		<property column="send_success" name="sendSuccess" not-null="false" type="java.lang.Boolean" />
-		<property column="code" name="code" not-null="false" type="java.lang.String" />
-        <property column="verfiy" name="verfiy" not-null="false" type="java.lang.Boolean" />
-        <property column="end_time" name="endTime" not-null="false" type="java.util.Date" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/intermediatry/po/Intermediatry.hbm.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.intermediatry.po">
-    <class name="Intermediatry" table="intermediatry_service">
-        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-        <property column="type" name="type" not-null="false" type="java.lang.String" />
-        <property column="title" name="title" not-null="false" type="java.lang.String" />
-        <property column="group_code" name="groupCode" not-null="false" type="java.lang.String" />
-        <property column="addr" name="addr" not-null="false" type="java.lang.String" />
-        <property column="legal_name" name="legalName" not-null="false" type="java.lang.String" />
-        <property column="legal_phone" name="legalPhone" not-null="false" type="java.lang.String" />
-        <property column="business_owner" name="businessOwner" not-null="false" type="java.lang.String" />
-        <property column="business_job" name="businessJob" not-null="false" type="java.lang.String" />
-        <property column="business_phone" name="businessPhone" not-null="false" type="java.lang.String" />
-        <property column="create_user_name" name="createUserName" not-null="false" type="java.lang.String" />
-        <property column="zxjb" name="zxjb" not-null="false" type="java.lang.String" />
-        <property column="zx_time" name="zxTime" not-null="false" type="java.util.Date" />
-        <property column="zx_time1" name="zxTime1" not-null="false" type="java.util.Date" />
-        <property column="zx_no" name="zxNo" not-null="false" type="java.lang.String" />
-        <property name="mainBusiness" type="java.lang.String">
-            <column name="main_business" not-null="false" sql-type="text"/>
-        </property>
-        <property column="remark" name="remark" not-null="false" type="java.lang.String" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="create_user" name="createUser" not-null="false" type="java.lang.String" />
-        <property column="update_time" name="updateTime" not-null="false" type="java.util.Date" />
-        <property column="update_user" name="updateUser" not-null="false" type="java.lang.String" />
-        <property column="status" name="status" not-null="false" type="java.lang.String" />
-        <property column="reason" name="reason" not-null="false" type="java.lang.String" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-    </class>
-
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/intermediatry/po/IntermediatryFile.hbm.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.intermediatry.po">
-    <class name="IntermediatryFile" table="intermediatry_service_file">
-        <id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-        <property column="inter_id" name="interId" not-null="false" type="java.lang.String" />
-        <property column="file_id" name="fileId" not-null="false" type="java.lang.String" />
-        <property column="file_type" name="fileType" not-null="false" type="java.lang.String" />
-        <property column="file_name" name="fileName" not-null="false" type="java.lang.String" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-    </class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/message/po/MessageConsume.hbm.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.message.po">
-	<class name="MessageConsume" table="mse_consume">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="mesinfo_id" name="msgInfoId" not-null="false" type="java.lang.String" />
-		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
-		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
-        <property column="status" name="status" not-null="false" type="java.lang.String" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-		<property column="date_read" name="dateRead" not-null="false" type="java.util.Date" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/message/po/MessageInfo.hbm.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.message.po">
-	<class name="MessageInfo" table="mse_info">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="user_id" name="userId" not-null="false" type="java.lang.String" />
-		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
-        <property column="content" name="content" not-null="false" type="java.lang.String" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-		<property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
-		<property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/msglog/po/PhoneMsgLog.hbm.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.msglog.po">
-	<class name="PhoneMsgLog" table="phone_msg_log">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="sub_id" name="subId" not-null="false" type="java.lang.String" />
-		<property column="msg_type" name="msgType" not-null="false" type="java.lang.String" />
-		<property column="user_name" name="userName" not-null="false" type="java.lang.String" />
-        <property column="content" name="content" not-null="false" type="java.lang.String" />
-        <property column="tel" name="tel" not-null="false" type="java.lang.String" />
-        <property column="kind" name="kind" not-null="false" type="java.lang.String" />
-        <property column="success" name="success" not-null="false" type="java.lang.Boolean" />
-        <property column="error_msg" name="errorMsg" not-null="false" type="java.lang.String" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-		<property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/notice/po/NoticePO.hbm.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.notice.po">
-	<class name="NoticePO" table="notice">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="title" name="title" not-null="false" type="java.lang.String" />
-		<property column="begin_date" name="beginDate" not-null="false" type="java.util.Date" />
-		<property column="end_date" name="endDate" not-null="false" type="java.util.Date" />
-		<property column="publish" name="publish" not-null="false" type="java.lang.Boolean" />
-		<property column="publish_date" name="publishDate" not-null="false" type="java.util.Date" />
-		<property name="content" type="java.lang.String">
-			<column name="content" not-null="false" sql-type="text"/>
-		</property>
-       <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/policy/po/PolicyDocumentColumn.hbm.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.policy.po">
-	<class name="PolicyDocumentColumn" table="policy_document_column">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="title" name="title" not-null="false" type="java.lang.String" />
-		<property column="index_x" name="indexX" not-null="false" type="java.lang.Integer" />
-		<property column="enable" name="enable" not-null="false" type="java.lang.Boolean" />
-		<property column="need_cover" name="needCover" not-null="false" type="java.lang.Boolean" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-	</class>
-</hibernate-mapping>

projects-service/target/classes/com/rtrh/projects/modules/policy/po/PolicyDocumentPO.hbm.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-<hibernate-mapping package="com.rtrh.projects.modules.policy.po">
-	<class name="PolicyDocumentPO" table="policy_document">
-		<id column="id" name="id" type="java.lang.String"><generator class="assigned"/></id>
-		<property column="rpt_date" name="rptDate" not-null="false" type="java.util.Date" />
-		<property column="cover_img" name="coverImg" not-null="false" type="java.lang.String" />
-		<property column="title" name="title" not-null="false" type="java.lang.String" />
-		<property column="title_sub" name="titleSub" not-null="false" type="java.lang.String" />
-		<property column="column_id" name="columnId" not-null="false" type="java.lang.String" />
-		<property column="index_x" name="indexX" not-null="false" type="java.lang.Integer" />
-		<property name="content" type="java.lang.String">
-			<column name="content" not-null="false" sql-type="text"/>
-		</property>
-		<property column="show_app" name="showApp" not-null="false" type="java.lang.Boolean" />
-		<property column="publish_status" name="publishStatus" not-null="false" type="java.lang.Boolean" />
-		<property column="publish_date" name="publishDate" not-null="false" type="java.util.Date" />
-        <property column="create_time" name="createTime" not-null="false" type="java.util.Date" />
-        <property column="create_user_id" name="createUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_user_id" name="lastUpdateUserId" not-null="false" type="java.lang.String" />
-        <property column="last_update_time" name="lastUpdateTime" not-null="false" type="java.util.Date" />
-        <property column="logic_delete_flag" name="logicDeleteFlag" not-null="false" type="java.lang.Integer" />
-	</class>
-</hibernate-mapping>