resolve merge conflicts: remove .idea and .svn

.idea/jarRepositories.xml

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="netflixoss" />
+      <option name="name" value="org.maven.repo1" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="goldenwater-public" />
+      <option name="name" value="goldenwater-public" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central-repos" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="gwt-maven" />
+      <option name="name" value="gwt-maven" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="gilead-maven-repo" />
+      <option name="name" value="gilead-maven-repo" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="java.net" />
+      <option name="name" value="java.net" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="cbay-snapshot" />
+      <option name="name" value="cbay-snapshot" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="gilead-repo" />
+      <option name="name" value="Gilead Maven Repository" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="datanucleus" />
+      <option name="name" value="datanucleus" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </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>
+    <remote-repository>
+      <option name="id" value="aliyun" />
+      <option name="name" value="aliyun" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central-repos2" />
+      <option name="name" value="Central Repository 2" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="boundlessgeo" />
+      <option name="name" value="boundlessgeo" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="JBoss repository" />
+      <option name="name" value="JBoss repository" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="gw-cloud" />
+      <option name="name" value="Goldenwater Nexus" />
+      <option name="url" value="http://nexus.goldenwater.com.cn/nexus/content/groups/public/" />
+    </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="maven.oracle.com" />
+      <option name="name" value="oracle-maven-repo" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="ibiblio" />
+      <option name="name" value="ibiblio" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="cloudera" />
+      <option name="name" value="cloudera" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="cbay-thirdparty" />
+      <option name="name" value="cbay-thirdparty" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="oschina-repos" />
+      <option name="name" value="Oschina Releases" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spring-releases" />
+      <option name="name" value="Spring Releases" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss" />
+      <option name="name" value="jboss" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2-repository.dev.java.net" />
+      <option name="name" value="Java.net Repository for Maven" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="hibernat4gwt-repo" />
+      <option name="name" value="hibernat4gwt-repo" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="JBoss 3rd-party" />
+      <option name="name" value="JBoss 3rd-party" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="cbay-release" />
+      <option name="name" value="cbay-release" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="org.maven.repo1" />
+      <option name="url" value="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="springsource-repos" />
+      <option name="name" value="SpringSource Repository" />
+      <option name="url" value="http://39.106.204.174: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="http://39.106.204.174:8081/nexus/content/groups/public/" />
+    </remote-repository>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="SvnBranchConfigurationManager">
+    <option name="myConfigurationMap">
+      <map>
+        <entry key="$PROJECT_DIR$">
+          <value>
+            <SvnBranchConfiguration />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/fj-dc.iml" filepath="$PROJECT_DIR$/fj-dc.iml" />
+    </modules>
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="04ea6278-a867-45f4-a369-09244b16f72d" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Interface" />
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="jar://$PROJECT_DIR$/../../repository/repository-dc/cn/com/goldenwater/gw-cloud-core/0.0.1-SNAPSHOT/gw-cloud-core-0.0.1-SNAPSHOT.jar!/cn/com/goldenwater/core/service/CrudService.class" root0="SKIP_INSPECTION" />
+  </component>
+  <component name="JsbtTreeLayoutManager">
+    <layout place="tools.popupGrunt">
+      <scroll-view-position x="0" y="0" />
+    </layout>
+  </component>
+  <component name="KubernetesApiPersistence">{}</component>
+  <component name="KubernetesApiProvider">{
+  &quot;isMigrated&quot;: true
+}</component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="localRepository" value="D:\repository" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 0
+}</component>
+  <component name="ProjectId" id="37utlFMEmBZWakIlNWgiIbfKdk3" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Maven.gw-cloud-platform-dcproj [clean,compile...].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [clean,install...].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [clean].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [dependency:tree...].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [install:install-file...].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [install].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj [package].executor&quot;: &quot;Run&quot;,
+    &quot;Maven.gw-cloud-platform-dcproj-service [package].executor&quot;: &quot;Run&quot;,
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;Spring Boot.GwCloudPlatformDcprojServiceApplication.executor&quot;: &quot;Run&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Workspaces/dc-province&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.30570903&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="ReactorSettings">
+    <option name="notificationShown" value="true" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\resources\mybatis\mappings" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\java\cn.com.goldenwater.dcproj\controller\sixme" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\java\cn.com.goldenwater.dcproj\controller\anze" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\java\cn.com.goldenwater.dcproj\service\impl" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\java\cn.com.goldenwater.dcproj\service" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-dao\src\main\resources\mybatis\mappings" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-model\src\main\java\cn.com.goldenwater.dcproj\param" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-model\src\main\java\cn.com.goldenwater.dcproj\model" />
+      <recent name="D:\Workspaces\dc-province\gw-cloud-platform-dcproj-wtcrr\src\main\java\cn.com.goldenwater.dcproj\model" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="cn.com.goldenwater.dcproj.param" />
+      <recent name="cn.com.goldenwater.dcproj.controller.anze" />
+      <recent name="cn.com.goldenwater.dcproj.model" />
+      <recent name="cn.com.goldenwater.dcproj.dto" />
+      <recent name="cn.com.goldenwater.dcproj.controller.pblm" />
+    </key>
+  </component>
+  <component name="RunAnythingCache">
+    <option name="myCommands">
+      <command value="mvn clean install -DskipTests" />
+      <command value="mvn package" />
+      <command value="mvn clean compile -U " />
+      <command value="mvn dependency:tree &quot;-Dincludes=ch.qos.logback:logback-classic&quot; " />
+      <command value="mvn install:install-file ^ -Dfile=C:\Users\24858\Desktop\alicom-mns-receive-sdk-1.0.1.jar ^ -DgroupId=com.aliyun.alicom ^ -DartifactId=alicom-mns-receive-sdk ^ -Dversion=1.0.1 ^ -Dpackaging=jar ^ -Dmaven.repo.local=D:\repository" />
+      <command value="mvn install:install-file ^ -Dfile=E:\桌面\alicom-mns-receive-sdk-1.0.1.jar ^ -DgroupId=com.aliyun.alicom ^ -DartifactId=alicom-mns-receive-sdk ^ -Dversion=1.0.1 ^ -Dpackaging=jar ^ -Dmaven.repo.local=D:\repository" />
+      <command value="mvn install:install-file ^ -Dfile=D:\repository\com\aliyun\alicom\alicom-mns-receive-sdk\1.0.1\alicom-mns-receive-sdk-1.0.1.jar ^ -DgroupId=com.aliyun.alicom ^ -DartifactId=alicom-mns-receive-sdk ^ -Dversion=1.0.1 ^ -Dpackaging=jar ^ -Dmaven.repo.local=D:\repository" />
+      <command value="mvn install:install-file ^ -Dfile=D:\repository\com\aliyun\alicom\alicom-mns-receive-sdk\1.0.1\alicom-mns-receive-sdk-1.0.1.jar ^ -DgroupId=com.aliyun.alicom ^ -DartifactId=alicom-mns-receive-sdk ^ -Dversion=1.0.1 ^ -Dpackaging=jar ^ -Dmaven.repo.local=D:\repository ^ -Dupdate=true" />
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration name="GwCloudPlatformDcprojServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
+      <module name="gw-cloud-platform-dcproj-main" />
+      <option name="PROGRAM_PARAMETERS" value=" -Dlogging.config=classpath:log4j2-dev.xml" />
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <option name="SPRING_BOOT_MAIN_CLASS" value="cn.com.goldenwater.dcproj.GwCloudPlatformDcprojServiceApplication" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-jdk-30f59d01ecdd-2fc7cc6b9a17-intellij.indexing.shared.core-IU-253.32098.37" />
+        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-IU-253.32098.37" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SvnConfiguration" cleanupOnStartRun="true">
+    <configuration>C:\Users\24858\AppData\Roaming\Subversion</configuration>
+    <supportedVersion>125</supportedVersion>
+  </component>
+  <component name="SvnFileUrlMappingImpl">
+    <option name="myMappingRoots">
+      <list>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="E:\桌面\fujian-ducha\fj-dc" />
+          <option name="myCopyRoot" value="E:\桌面\fujian-ducha\fj-dc" />
+        </SvnCopyRootSimple>
+      </list>
+    </option>
+    <option name="myMoreRealMappingRoots">
+      <list>
+        <SvnCopyRootSimple>
+          <option name="myVcsRoot" value="E:\桌面\fujian-ducha\fj-dc" />
+          <option name="myCopyRoot" value="E:\桌面\fujian-ducha\fj-dc" />
+        </SvnCopyRootSimple>
+      </list>
+    </option>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="04ea6278-a867-45f4-a369-09244b16f72d" name="Changes" comment="" />
+      <created>1767764932231</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1767764932231</updated>
+      <workItem from="1767764933243" duration="23443000" />
+      <workItem from="1768108280552" duration="12000" />
+      <workItem from="1768109632057" duration="288000" />
+      <workItem from="1768110560952" duration="3928000" />
+      <workItem from="1768180413605" duration="11608000" />
+      <workItem from="1768267414390" duration="5189000" />
+      <workItem from="1768369344476" duration="3219000" />
+      <workItem from="1768438976760" duration="2960000" />
+      <workItem from="1768957421393" duration="21087000" />
+      <workItem from="1769158381452" duration="1680000" />
+      <workItem from="1769222316845" duration="1707000" />
+      <workItem from="1769392114078" duration="6913000" />
+      <workItem from="1769486841684" duration="19335000" />
+      <workItem from="1769564314406" duration="7090000" />
+      <workItem from="1769580965053" duration="24000" />
+      <workItem from="1769653013220" duration="1406000" />
+      <workItem from="1770087133193" duration="9827000" />
+      <workItem from="1770598980591" duration="1673000" />
+      <workItem from="1770620317302" duration="14018000" />
+      <workItem from="1771916808714" duration="1395000" />
+      <workItem from="1771980605469" duration="39438000" />
+      <workItem from="1772241268948" duration="8260000" />
+      <workItem from="1772760234819" duration="12046000" />
+      <workItem from="1773022546254" duration="13789000" />
+      <workItem from="1773105814725" duration="1383000" />
+      <workItem from="1773110000391" duration="3021000" />
+      <workItem from="1773113952046" duration="1553000" />
+      <workItem from="1773116058098" duration="3000" />
+      <workItem from="1773116090236" duration="2048000" />
+      <workItem from="1773125720853" duration="1442000" />
+      <workItem from="1773278608120" duration="3147000" />
+      <workItem from="1773299151610" duration="17935000" />
+      <workItem from="1773393209146" duration="3540000" />
+      <workItem from="1773623805426" duration="4754000" />
+      <workItem from="1773643836084" duration="8000" />
+      <workItem from="1773796721286" duration="353000" />
+      <workItem from="1773816245412" duration="12387000" />
+      <workItem from="1773885577099" duration="4152000" />
+      <workItem from="1773899100414" duration="914000" />
+      <workItem from="1774926068878" duration="8588000" />
+      <workItem from="1775205313715" duration="1247000" />
+      <workItem from="1776233001152" duration="2926000" />
+      <workItem from="1776303429978" duration="693000" />
+      <workItem from="1776325176883" duration="10000" />
+      <workItem from="1776333171660" duration="39000" />
+      <workItem from="1776647215577" duration="6138000" />
+      <workItem from="1776750513705" duration="26182000" />
+      <workItem from="1776826995112" duration="2899000" />
+      <workItem from="1776831594605" duration="331000" />
+      <workItem from="1776831943972" duration="73000" />
+      <workItem from="1776832025232" duration="9545000" />
+      <workItem from="1776851882175" duration="10871000" />
+      <workItem from="1776933328281" duration="2297000" />
+      <workItem from="1777356833127" duration="17159000" />
+      <workItem from="1777528850453" duration="2624000" />
+      <workItem from="1778023913971" duration="27067000" />
+      <workItem from="1778132205422" duration="5785000" />
+      <workItem from="1778553354018" duration="10294000" />
+      <workItem from="1778636566759" duration="610000" />
+      <workItem from="1778838846463" duration="3376000" />
+      <workItem from="1779105799369" duration="6409000" />
+      <workItem from="1779154711808" duration="7250000" />
+      <workItem from="1779242201705" duration="10294000" />
+      <workItem from="1779326848269" duration="6603000" />
+      <workItem from="1779424408250" duration="789000" />
+      <workItem from="1779425206270" duration="1690000" />
+      <workItem from="1779426907846" duration="4471000" />
+      <workItem from="1779434919714" duration="1429000" />
+      <workItem from="1779436868471" duration="4000" />
+      <workItem from="1779436920487" duration="1799000" />
+      <workItem from="1779526625439" duration="931000" />
+      <workItem from="1779527578121" duration="2959000" />
+      <workItem from="1779679972356" duration="1538000" />
+      <workItem from="1779696522193" duration="14000" />
+      <workItem from="1779934762209" duration="771000" />
+      <workItem from="1780018526769" duration="6407000" />
+      <workItem from="1780450339902" duration="186000" />
+      <workItem from="1780558555604" duration="914000" />
+      <workItem from="1781082823714" duration="693000" />
+      <workItem from="1781252769136" duration="1843000" />
+      <workItem from="1781257844178" duration="989000" />
+      <workItem from="1781260743484" duration="6198000" />
+      <workItem from="1781745537675" duration="83583000" />
+      <workItem from="1782295935882" duration="65000" />
+      <workItem from="1782296084152" duration="3000" />
+      <workItem from="1782296115803" duration="85000" />
+      <workItem from="1782296221002" duration="140000" />
+      <workItem from="1782296383287" duration="723000" />
+      <workItem from="1782297128663" duration="686000" />
+      <workItem from="1782297830468" duration="757000" />
+      <workItem from="1782298620677" duration="2261000" />
+      <workItem from="1782437826449" duration="39204000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnknownFeatures">
+    <option featureType="dependencySupport" implementationName="java:org.springframework:spring-core" />
+    <option featureType="dependencySupport" implementationName="java:io.projectreactor:reactor-core" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework.data:spring-data-commons" />
+    <option featureType="dependencySupport" implementationName="executable:kubectl" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework.cloud:spring-cloud-context" />
+    <option featureType="dependencySupport" implementationName="java:org.hibernate.validator:hibernate-validator" />
+    <option featureType="dependencySupport" implementationName="java:javax.validation:validation-api" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework:spring-webmvc" />
+    <option featureType="dependencySupport" implementationName="java:org.projectlombok:lombok" />
+    <option featureType="dependencySupport" implementationName="java:junit:junit" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework:spring-websocket" />
+    <option featureType="dependencySupport" implementationName="executable:docker" />
+    <option featureType="dependencySupport" implementationName="java:org.thymeleaf:thymeleaf" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework:spring-messaging" />
+    <option featureType="dependencySupport" implementationName="java:org.springframework.boot:spring-boot" />
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+</project>

gw-cloud-platform-dcproj-agora/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=gw-cloud-platform-dcproj-agora
+groupId=cn.com.goldenwater
+version=0.0.1-SNAPSHOT

gw-cloud-platform-dcproj-agora/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,55 @@
+io\agora\media\DynamicKey5$DynamicKey5Content.class
+io\agora\media\DynamicKey5.class
+io\agora\sample\Base64Encoding.class
+io\agora\chat\ChatTokenBuilder2.class
+io\agora\media\AccessToken2$ServiceRtc.class
+io\agora\media\AccessToken2.class
+cn\com\goldenwater\dcproj\controller\AgoraStudioDescController.class
+io\agora\media\PackableEx.class
+io\agora\media\RtcTokenBuilder2.class
+io\agora\media\AccessToken2$ServiceRtm.class
+io\agora\media\AccessToken2$ServiceStreaming.class
+io\agora\media\RtcTokenBuilder.class
+cn\com\goldenwater\dcproj\service\impl\AgoraStudioDescServiceImpl.class
+io\agora\media\AccessToken2$PrivilegeChat.class
+cn\com\goldenwater\dcproj\service\AgoraStudioDescService.class
+io\agora\media\ByteBuf.class
+io\agora\media\DynamicKeyUtil.class
+cn\com\goldenwater\dcproj\dto\AgoraTokenDto.class
+io\agora\media\AccessToken$PackContent.class
+io\agora\media\RtcTokenBuilder2$Role.class
+io\agora\sample\RtmTokenBuilderSample.class
+cn\com\goldenwater\dcproj\model\AgoraToken.class
+io\agora\rtm\RtmTokenBuilder2.class
+cn\com\goldenwater\dcproj\model\AgoraStudioDesc.class
+cn\com\goldenwater\dcproj\service\impl\AgoraTokenServiceImpl.class
+io\agora\media\AccessToken$PrivilegeMessage.class
+io\agora\media\AccessToken2$PrivilegeStreaming.class
+io\agora\media\DynamicKey5$Message.class
+io\agora\media\DynamicKey4.class
+io\agora\sample\DynamicKey5Sample.class
+io\agora\media\Utils.class
+io\agora\sample\RtcTokenBuilderSample.class
+io\agora\sample\SignalingTokenSample.class
+io\agora\rtm\RtmTokenBuilder$Role.class
+io\agora\media\DynamicKey.class
+io\agora\sample\AccessTokenInspector.class
+io\agora\sample\Verifier5.class
+io\agora\media\AccessToken2$ServiceChat.class
+io\agora\sample\ChatTokenBuilder2Sample.class
+io\agora\media\AccessToken$Privileges.class
+cn\com\goldenwater\dcproj\service\AgoraChannelService.class
+io\agora\media\AccessToken2$Service.class
+io\agora\media\AccessToken.class
+cn\com\goldenwater\dcproj\dao\AgoraStudioDescDao.class
+io\agora\media\AccessToken2$PrivilegeRtm.class
+io\agora\signal\SignalingToken.class
+io\agora\rtm\RtmTokenBuilder.class
+io\agora\media\Packable.class
+cn\com\goldenwater\dcproj\service\AgoraTokenService.class
+cn\com\goldenwater\dcproj\service\impl\AgoraChannelServiceImpl.class
+cn\com\goldenwater\dcproj\param\AgoraStudioDescParam.class
+io\agora\media\AccessToken2$PrivilegeRtc.class
+io\agora\media\DynamicKey3.class
+io\agora\media\RtcTokenBuilder$Role.class
+io\agora\media\AccessToken2$Service$1.class

gw-cloud-platform-dcproj-agora/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,38 @@
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\controller\AgoraStudioDescController.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\controller\AgoraTokenController.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\dao\AgoraStudioDescDao.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\dto\AgoraTokenDto.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\model\AgoraStudioDesc.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\model\AgoraToken.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\param\AgoraStudioDescParam.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\AgoraChannelService.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\AgoraStudioDescService.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\AgoraTokenService.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\impl\AgoraChannelServiceImpl.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\impl\AgoraStudioDescServiceImpl.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\cn.com.goldenwater.dcproj\service\impl\AgoraTokenServiceImpl.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\chat\ChatTokenBuilder2.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\AccessToken.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\AccessToken2.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\ByteBuf.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\DynamicKey.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\DynamicKey3.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\DynamicKey4.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\DynamicKey5.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\DynamicKeyUtil.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\Packable.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\PackableEx.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\RtcTokenBuilder.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\RtcTokenBuilder2.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\media\Utils.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\rtm\RtmTokenBuilder.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\rtm\RtmTokenBuilder2.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\AccessTokenInspector.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\Base64Encoding.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\ChatTokenBuilder2Sample.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\DynamicKey5Sample.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\RtcTokenBuilderSample.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\RtmTokenBuilderSample.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\SignalingTokenSample.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\sample\Verifier5.java
+E:\桌面\fujian-ducha\fj-dc\gw-cloud-platform-dcproj-agora\src\main\java\io\agora\signal\SignalingToken.java

gw-cloud-platform-dcproj-aop/src/main/java/cn/com/goldenwater/dcproj/target/VerifyBeanAspect.java

@@ -85,6 +85,13 @@ public class VerifyBeanAspect {
                 }
                 Field[] fields = object.getClass().getDeclaredFields();
                 for (Field field : fields) {
+                    // ============【新增开始】============
+                    Class<?> fieldOwnerClass = field.getDeclaringClass();
+                    String className = fieldOwnerClass.getName();
+                    if (className.startsWith("java.") || className.startsWith("javax.") || className.startsWith("jdk.")) {
+                        continue;
+                    }
+                    // ============【新增结束】============
                     field.setAccessible(true);
                     //所有字符数据校验
                     String name = field.getName();