module_news function prefect

8e436d4f · 门心叼龙 · f70d55dc · 8e436d4f · 8e436d4f · f70d55dc
19 changed file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -42,32 +42,25 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="f9f366cc-d6b3-4967-a989-a813e7df54f9" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10/fileHashes/fileHashes.bin" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sql/sys-news_news_detail.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10/fileHashes/fileHashes.lock" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sql/sys-news_news_type.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10/taskHistory/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10/taskHistory/taskHistory.bin" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sql/sys-news_routines.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/4.10/taskHistory/taskHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.10/taskHistory/taskHistory.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2019-02-22T101452.200.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2019-02-22T102141.200.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2019-02-22T102226.200.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/httpRequests/2019-02-22T102832.200.json" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/httpRequests/http-requests-log.http" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/com.fly.moudle_user.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/module_blog/com.fly.module_blog.main.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/module_blog/com.fly.module_blog.test.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/moudle_user/com.fly.moudle_user.main.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/moudle_user/com.fly.moudle_user.test.iml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/admin-service-pro.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/admin-service-pro.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/admin-service-pro.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/META-INF/com.fly.module_news.main.kotlin_module" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/module_blog/out/production/classes/com/fly/blog/config/SwaggerConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_blog/out/production/classes/com/fly/blog/config/SwaggerConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/entity/NewsType.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/entity/NewsType.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/config/SwaggerConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/config/SwaggerConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/service/NewsDetailService.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/service/NewsDetailService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/config/SwaggerConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/config/SwaggerConfig.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/web/NewsDetailController.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/web/NewsDetailController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/web/NewsTypeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/out/production/classes/com/fly/news/web/NewsTypeController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/service/UserService.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/service/UserService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/web/UserController.class" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/out/production/classes/com/fly/user/web/UserController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dao/UserDao.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/service/UserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/service/UserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/web/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/web/UserController.java" afterDir="false" />
    </list>
    <ignored path="$PROJECT_DIR$/.gradle/" />
    <ignored path="$PROJECT_DIR$/build/" />
@@ -206,7 +199,7 @@
    <favorites_list name="FlyCloud" />
  </component>
  <component name="FileEditorManager">
-    <leaf />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
  </component>
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
@@ -238,9 +231,6 @@
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
-        <option value="$PROJECT_DIR$/moudle_user/src/main/java/com/fly/user/util/HttpUtils.java" />
-        <option value="$PROJECT_DIR$/moudle_user/src/main/java/com/fly/user/util/UserUtils.java" />
-        <option value="$PROJECT_DIR$/moudle_user/src/main/java/com/fly/user/web/UserController.java" />
        <option value="$PROJECT_DIR$/moudle_user/src/main/java/com/fly/user/UserServiceApplication.java" />
        <option value="$PROJECT_DIR$/sql/sys-blog.sql" />
        <option value="$PROJECT_DIR$/sql/sys-log.sql" />
@@ -272,23 +262,26 @@
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/aop/SysLoggerAspect.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/BlogDao.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/BlogService.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsTypeService.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/NewsServiceApplication.java" />
        <option value="$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/dto/RespDTO.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/resources/bootstrap.yml" />
        <option value="$PROJECT_DIR$/module_config/src/main/resources/shared/news-service-pro.yml" />
        <option value="$PROJECT_DIR$/module_config/src/main/java/com/fly/config/ConfigServerApplication.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsController.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/NewsTypeDao.java" />
        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/NewsDetailDao.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsTypeController.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java" />
-        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java" />
        <option value="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
        <option value="$PROJECT_DIR$/.idea/compiler.xml" />
        <option value="$PROJECT_DIR$/.idea/workspace.xml" />
+        <option value="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dao/UserDao.java" />
+        <option value="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/service/UserService.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsTypeService.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java" />
+        <option value="$PROJECT_DIR$/module_user/src/main/java/com/fly/user/web/UserController.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsTypeController.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java" />
+        <option value="$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java" />
      </list>
    </option>
  </component>
@@ -310,29 +303,19 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
+      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
-              <item name="FlyCloud-2.0.0" type="b2602c69:ProjectViewProjectNode" />
+              <item name="FlyCloud" type="b2602c69:ProjectViewProjectNode" />
-              <item name="FlyCloud-2.0.0" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="FlyCloud" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-            </path>
-            <path>
-              <item name="FlyCloud-2.0.0" type="b2602c69:ProjectViewProjectNode" />
-              <item name="FlyCloud-2.0.0" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name=".idea" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="FlyCloud-2.0.0" type="b2602c69:ProjectViewProjectNode" />
-              <item name="FlyCloud-2.0.0" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="gradle" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="PackagesPane" />
-      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -344,7 +327,7 @@
    <property name="RequestMappingsPanelWidth2" value="75" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560649887082" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1561302443551" />
    <property name="dynamic.classpath" value="true" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -452,99 +435,86 @@
        </RuleState>
      </list>
    </option>
-    <option name="contentProportion" value="0.52360517" />
+    <option name="contentProportion" value="0.2534153" />
  </component>
-  <component name="RunManager" selected="Spring Boot.EurekaServerApplication">
+  <component name="RunManager" selected="Spring Boot.AdminServiceApplication">
    <configuration name="AdminServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_admin.main" />
+      <module name="module_admin.com.fly.module_admin.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.admin.AdminServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="BlogServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_blog.main" />
+      <module name="module_blog.com.fly.module_blog.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.blog.BlogServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="ConfigServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_config.main" />
+      <module name="module_config.com.fly.module_config.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.config.ConfigServerApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="EurekaServerApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_eureka.main" />
+      <module name="module_eureka.com.fly.module_eureka.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.eureka.EurekaServerApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="GatewayServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_gateway.main" />
+      <module name="module_gateway.com.fly.module_gateway.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.gateway.GatewayServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="LogServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_log.main" />
+      <module name="module_log.com.fly.module_log.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.log.LogServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="MonitorServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_monitor.main" />
+      <module name="module_monitor.com.fly.module_monitor.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.monitor.MonitorServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="NewsServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_news.main" />
+      <module name="module_news.com.fly.module_news.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.news.NewsServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="UaaServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_uaa.main" />
+      <module name="module_uaa.com.fly.module_uaa.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.uaa.UaaServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="UserServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_user.main" />
+      <module name="module_user.com.fly.module_user.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.user.UserServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="ZipkinServiceApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="com.fly.module_zipkin.main" />
+      <module name="module_zipkin.com.fly.module_zipkin.main" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.fly.zipkin.ZipkinServiceApplication" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
-    <list>
-      <item itemvalue="Spring Boot.AdminServiceApplication" />
-      <item itemvalue="Spring Boot.ConfigServerApplication" />
-      <item itemvalue="Spring Boot.EurekaServerApplication" />
-      <item itemvalue="Spring Boot.GatewayServiceApplication" />
-      <item itemvalue="Spring Boot.MonitorServiceApplication" />
-      <item itemvalue="Spring Boot.LogServiceApplication" />
-      <item itemvalue="Spring Boot.UaaServiceApplication" />
-      <item itemvalue="Spring Boot.UserServiceApplication" />
-      <item itemvalue="Spring Boot.BlogServiceApplication" />
-      <item itemvalue="Spring Boot.ZipkinServiceApplication" />
-      <item itemvalue="Spring Boot.NewsServiceApplication" />
-    </list>
  </component>
  <component name="SvnConfiguration">
    <configuration />
@@ -577,6 +547,9 @@
      <workItem from="1560646043205" duration="1505000" />
      <workItem from="1560647612431" duration="1103000" />
      <workItem from="1560648826960" duration="1457000" />
+      <workItem from="1561159258945" duration="216000" />
+      <workItem from="1561159509769" duration="3952000" />
+      <workItem from="1561250775987" duration="14452000" />
    </task>
    <task id="LOCAL-00001" summary="app update">
      <created>1559721472069</created>
@@ -589,12 +562,12 @@
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="98791000" />
+    <option name="totallyTimeSpent" value="117411000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4973046" visible="true" weight="0.25871313" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4973046" visible="true" weight="0.26541555" />
      <window_info id="Structure" order="1" sideWeight="0.50269544" side_tool="true" weight="0.36461318" />
      <window_info id="Designer" order="2" />
      <window_info id="Image Layers" order="3" />
@@ -609,16 +582,16 @@
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Build" order="7" weight="0.3180593" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932975" weight="0.31728044" />
      <window_info anchor="bottom" id="Spring" order="8" weight="0.32884097" />
      <window_info anchor="bottom" id="Terminal" order="9" />
      <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.20040214" side_tool="true" visible="true" weight="0.41926345" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.20174263" side_tool="true" weight="0.21671388" />
-      <window_info anchor="bottom" id="Messages" order="12" weight="0.2917847" />
+      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49798927" weight="0.51699716" />
      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32884097" />
      <window_info anchor="bottom" id="Database Changes" order="14" />
-      <window_info anchor="bottom" id="Version Control" order="15" weight="0.34770888" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.34702548" />
-      <window_info anchor="bottom" id="Run Dashboard" order="16" sideWeight="0.79959786" visible="true" weight="0.41926345" />
+      <window_info anchor="bottom" id="Run Dashboard" order="16" sideWeight="0.79825735" visible="true" weight="0.08215298" />
      <window_info anchor="bottom" id="REST Client" order="17" weight="0.69541776" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -633,7 +606,7 @@
      <window_info anchor="right" id="Bean Validation" order="10" weight="0.3295129" />
    </layout>
    <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4973046" visible="true" weight="0.36461318" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4973046" visible="true" weight="0.26541555" />
      <window_info id="Structure" order="1" sideWeight="0.50269544" side_tool="true" weight="0.36461318" />
      <window_info id="Designer" order="2" />
      <window_info id="Image Layers" order="3" />
@@ -648,16 +621,16 @@
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Build" order="7" weight="0.3180593" />
+      <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932975" weight="0.31728044" />
      <window_info anchor="bottom" id="Spring" order="8" weight="0.32884097" />
      <window_info anchor="bottom" id="Terminal" order="9" />
      <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.20174263" side_tool="true" weight="0.21671388" />
-      <window_info anchor="bottom" id="Messages" order="12" weight="0.29245284" />
+      <window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49798927" weight="0.51699716" />
      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.32884097" />
      <window_info anchor="bottom" id="Database Changes" order="14" />
-      <window_info anchor="bottom" id="Version Control" order="15" weight="0.34770888" />
+      <window_info anchor="bottom" id="Version Control" order="15" weight="0.34702548" />
-      <window_info active="true" anchor="bottom" id="Run Dashboard" order="16" visible="true" weight="0.65768194" />
+      <window_info anchor="bottom" id="Run Dashboard" order="16" sideWeight="0.79825735" weight="0.9575071" />
      <window_info anchor="bottom" id="REST Client" order="17" weight="0.69541776" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -675,6 +648,16 @@
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
+  <component name="Vcs.Log.History.Properties">
+    <option name="COLUMN_ORDER">
+      <list>
+        <option value="0" />
+        <option value="2" />
+        <option value="3" />
+        <option value="1" />
+      </list>
+    </option>
+  </component>
  <component name="VcsManagerConfiguration">
    <MESSAGE value="app update" />
    <option name="LAST_COMMIT_MESSAGE" value="app update" />
@@ -684,57 +667,6 @@
    <option name="FILTER_TARGETS" value="false" />
  </component>
  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/module_blog/src/main/java/com/fly/blog/util/HttpUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1522">
-          <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_blog/src/main/java/com/fly/blog/web/BlogController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-453">
-          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib_common/build.gradle">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/annotation/SysLogger.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/dto/RespDTO.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="11">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-          <folding>
-            <element signature="e#706#707#0" expanded="true" />
-            <element signature="e#738#739#0" expanded="true" />
-            <element signature="e#780#781#0" expanded="true" />
-            <element signature="e#814#815#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/exception/CommonException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-14">
-          <caret line="13" column="11" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/exception/ErrorCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="9" column="12" selection-start-line="9" selection-start-column="12" selection-end-line="9" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/module_config/src/main/resources/shared/uaa-service-pro.yml">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
@@ -769,13 +701,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/web/UserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="30" column="41" lean-forward="true" selection-start-line="30" selection-start-column="41" selection-end-line="30" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/NewsServiceApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="275">
@@ -783,13 +708,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/entity/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/User.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="350">
@@ -797,28 +715,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="239">
-          <caret line="33" column="66" lean-forward="true" selection-start-line="32" selection-start-column="3" selection-end-line="33" selection-end-column="66" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#740#741#0" expanded="true" />
-            <element signature="e#765#766#0" expanded="true" />
-            <element signature="e#799#800#0" expanded="true" />
-            <element signature="e#827#828#0" expanded="true" />
-            <element signature="e#869#870#0" expanded="true" />
-            <element signature="e#900#901#0" expanded="true" />
-            <element signature="e#948#949#0" expanded="true" />
-            <element signature="e#988#989#0" expanded="true" />
-            <element signature="e#1020#1021#0" expanded="true" />
-            <element signature="e#1050#1051#0" expanded="true" />
-            <element signature="e#1094#1095#0" expanded="true" />
-            <element signature="e#1132#1133#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/caches/modules-2/files-2.1/org.springframework.data/spring-data-jpa/1.11.8.RELEASE/50f212b50c938a11ab6bc6e4b092357bacbc0502/spring-data-jpa-1.11.8.RELEASE-sources.jar!/org/springframework/data/jpa/repository/JpaRepository.java" />
    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/NewsTypeDao.java">
      <provider selected="true" editor-type-id="text-editor">
@@ -858,16 +754,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="525">
-          <caret line="24" selection-start-line="24" selection-end-line="24" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/sql/sys-blog.sql">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="400">
@@ -875,65 +761,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsTypeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="975">
-          <caret line="51" column="30" selection-start-line="51" selection-start-column="30" selection-end-line="51" selection-end-column="30" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="31" column="52" selection-start-line="31" selection-start-column="52" selection-end-line="31" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsTypeService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#578#579#0" expanded="true" />
-            <element signature="e#627#628#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="550">
-          <caret line="34" column="37" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
-          <folding>
-            <element signature="e#708#709#0" expanded="true" />
-            <element signature="e#748#749#0" expanded="true" />
-            <element signature="e#808#809#0" expanded="true" />
-            <element signature="e#865#866#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/NewsDetailDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dao/UserDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="14" column="17" selection-start-line="14" selection-start-column="17" selection-end-line="14" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/sql/sys-user.sql">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="75">
@@ -954,13 +781,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/.idea/modules/com.fly.moudle_user.iml" />
    <entry file="file://$PROJECT_DIR$/.idea/modules.xml" />
    <entry file="file://$PROJECT_DIR$/module_config/build.gradle">
@@ -1019,6 +839,170 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dto/LoginDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib_common/src/main/java/com/fly/common/dto/RespDTO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="12" selection-start-line="12" selection-end-line="12" />
+          <folding>
+            <element signature="e#706#707#0" expanded="true" />
+            <element signature="e#738#739#0" expanded="true" />
+            <element signature="e#780#781#0" expanded="true" />
+            <element signature="e#814#815#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/entity/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/dao/UserDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="8" column="22" lean-forward="true" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework.data/spring-data-jpa/1.11.8.RELEASE/50f212b50c938a11ab6bc6e4b092357bacbc0502/spring-data-jpa-1.11.8.RELEASE-sources.jar!/org/springframework/data/jpa/repository/JpaRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="61" column="26" selection-start-line="61" selection-start-column="26" selection-end-line="61" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/service/UserService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+          <folding>
+            <element signature="e#894#895#0" expanded="true" />
+            <element signature="e#949#950#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/dao/NewsDetailDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="375">
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework.data/spring-data-commons/1.13.8.RELEASE/8977efb05a9c6dea150ef43c41bbcc26f7bd1fa1/spring-data-commons-1.13.8.RELEASE-sources.jar!/org/springframework/data/repository/CrudRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="35" column="35" lean-forward="true" selection-start-line="35" selection-start-column="35" selection-end-line="35" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsTypeService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="26" selection-start-line="26" selection-end-line="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#627#628#0" expanded="true" />
+            <element signature="e#752#753#0" expanded="true" />
+            <element signature="e#797#798#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_user/src/main/java/com/fly/user/web/UserController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="725">
+          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/service/NewsDetailService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="33">
+          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
+          <folding>
+            <element signature="e#610#611#0" expanded="true" />
+            <element signature="e#663#664#0" expanded="true" />
+            <element signature="e#708#709#0" expanded="true" />
+            <element signature="e#748#749#0" expanded="true" />
+            <element signature="e#807#808#0" expanded="true" />
+            <element signature="e#864#865#0" expanded="true" />
+            <element signature="e#808#809#0" expanded="true" />
+            <element signature="e#865#866#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsTypeController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="34" column="47" lean-forward="true" selection-start-line="34" selection-start-column="47" selection-end-line="34" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_191/src.zip!/java/util/Date.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1200">
+          <caret line="66" column="67" selection-start-line="66" selection-start-column="67" selection-end-line="66" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/web/NewsDetailController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="217">
+          <caret line="34" column="3" lean-forward="true" selection-start-line="34" selection-start-column="3" selection-end-line="34" selection-end-column="77" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/module_news/src/main/java/com/fly/news/entity/NewsDetail.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="30" column="27" lean-forward="true" selection-start-line="30" selection-start-column="27" selection-end-line="30" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/sql/sys-news_routines.sql">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="400">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </state>
+      </provider>
+    </entry>
  </component>
  <component name="masterDetails">
    <states>

--- a/logs/admin-service-pro.log
+++ b/logs/admin-service-pro.log
--- a/module_news/out/production/classes/META-INF/com.fly.module_news.main.kotlin_module
+++ b/module_news/out/production/classes/META-INF/com.fly.module_news.main.kotlin_module
--- a/module_news/out/production/classes/com/fly/news/entity/NewsDetail.class
+++ b/module_news/out/production/classes/com/fly/news/entity/NewsDetail.class
--- a/module_news/out/production/classes/com/fly/news/entity/NewsType.class
+++ b/module_news/out/production/classes/com/fly/news/entity/NewsType.class
--- a/module_news/out/production/classes/com/fly/news/service/NewsDetailService.class
+++ b/module_news/out/production/classes/com/fly/news/service/NewsDetailService.class
--- a/module_news/out/production/classes/com/fly/news/web/NewsDetailController.class
+++ b/module_news/out/production/classes/com/fly/news/web/NewsDetailController.class
--- a/module_news/src/main/java/com/fly/news/entity/NewsDetail.java
+++ b/module_news/src/main/java/com/fly/news/entity/NewsDetail.java
 package com.fly.news.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.CreatedDate;
 import javax.persistence.*;
@@ -30,6 +31,7 @@ public class NewsDetail {
    private String content;
    @CreatedDate
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
    @Column(name = "addtime", updatable = false, nullable = false)
    private Date addtime;

--- a/module_news/src/main/java/com/fly/news/entity/NewsType.java
+++ b/module_news/src/main/java/com/fly/news/entity/NewsType.java
 package com.fly.news.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.data.annotation.CreatedDate;
 import javax.persistence.*;
@@ -31,7 +32,8 @@ public class NewsType implements Serializable {
     * 创建时间
     */
    @CreatedDate
-    @Column(name = "addtime", updatable = false, nullable = false)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+    @Column(name = "addtime", updatable = false, nullable = true)
    private Date addtime;
    public Long getId() {

--- a/module_news/src/main/java/com/fly/news/service/NewsDetailService.java
+++ b/module_news/src/main/java/com/fly/news/service/NewsDetailService.java
@@ -30,7 +30,9 @@ public class NewsDetailService {
    public void deleteNewsDetail(long id) {
        newsDetailDao.delete(id);
    }
+    public NewsDetail findNewsDetailById(long id) {
+        return newsDetailDao.findOne(id);
+    }
    public List<NewsDetail> findListByTypeid(int typeid) {
        return newsDetailDao.findByTypeid(typeid);
    }

--- a/module_news/src/main/java/com/fly/news/web/NewsDetailController.java
+++ b/module_news/src/main/java/com/fly/news/web/NewsDetailController.java
@@ -34,7 +34,7 @@ public class NewsDetailController {
        return RespDTO.onSuc(newsDetail1);
    }
-    @ApiOperation(value = "获取指定类型的新闻详情", notes = "获取指定类型的新闻详情")
+    @ApiOperation(value = "获取指定类型的新闻列表", notes = "获取指定类型的新闻列表")
    @PreAuthorize("hasAuthority('ROLE_USER')")
    @PostMapping("/query/all")
    @SysLogger("getListNewsDetail")
@@ -43,6 +43,14 @@ public class NewsDetailController {
        return RespDTO.onSuc(newsDetails);
    }
+    @ApiOperation(value = "根据id查询新闻详情", notes = "根据id查询新闻详情")
+    @PreAuthorize("hasAuthority('ROLE_USER')")
+    @GetMapping("/{id}/detail")
+    @SysLogger("queryNewsDetail")
+    public RespDTO getNewsDetail(@PathVariable Long id){
+        return RespDTO.onSuc(newsDetailService.findNewsDetailById(id));
+    }
    @ApiOperation(value = "根据id删除新闻详情", notes = "根据id删除新闻详情")
    @PreAuthorize("hasAuthority('ROLE_USER')")
    @GetMapping("/{id}/delete")

--- a/module_user/out/production/classes/com/fly/user/service/UserService.class
+++ b/module_user/out/production/classes/com/fly/user/service/UserService.class
--- a/module_user/out/production/classes/com/fly/user/web/UserController.class
+++ b/module_user/out/production/classes/com/fly/user/web/UserController.class
--- a/module_user/src/main/java/com/fly/user/dao/UserDao.java
+++ b/module_user/src/main/java/com/fly/user/dao/UserDao.java
@@ -15,4 +15,5 @@ import org.springframework.data.jpa.repository.JpaRepository;
 public interface UserDao extends JpaRepository<User, Long> {
 	User findByUsername(String username);
 }
--- a/module_user/src/main/java/com/fly/user/service/UserService.java
+++ b/module_user/src/main/java/com/fly/user/service/UserService.java
@@ -7,8 +7,8 @@ import com.fly.user.dao.UserDao;
 import com.fly.user.dto.LoginDTO;
 import com.fly.user.entity.JWT;
 import com.fly.user.entity.User;
-import com.fly.user.util.BPwdEncoderUtils;
 import com.fly.user.client.AuthServiceClient;
+import com.fly.user.util.BPwdEncoderUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 public class UserService {
    @Autowired
+    public
    UserDao userDao;
    @Autowired
    AuthServiceClient authServiceClient;
@@ -34,7 +35,8 @@ public class UserService {
    public User getUserInfo(String username){
        return userDao.findByUsername(username);
    }
-    public RespDTO login(String username , String password){
+    public RespDTO login(String username, String password){
       User user= userDao.findByUsername(username);
       if(null==user){
           throw new CommonException(ErrorCode.USER_NOT_FOUND);

--- a/module_user/src/main/java/com/fly/user/web/UserController.java
+++ b/module_user/src/main/java/com/fly/user/web/UserController.java
@@ -6,7 +6,6 @@ import com.fly.user.entity.User;
 import com.fly.user.service.UserService;
 import com.fly.user.util.BPwdEncoderUtils;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -53,11 +52,4 @@ public class UserController {
        User user=  userService.getUserInfo(username);
        return RespDTO.onSuc(user);
    }
-//    @Autowired
-//    private AmqpTemplate rabbitTemplate;
-//    @GetMapping("/test")
-//    public void test(){
-//        rabbitTemplate.convertAndSend(RabbitConfig.queueName, "Hello from RabbitMQ!");
-//    }
 }
--- a/sql/sys-news_news_detail.sql
+++ b/sql/sys-news_news_detail.sql
+-- MySQL dump 10.13  Distrib 5.7.17, for Win64 (x86_64)
+--
+-- Host: localhost    Database: sys-news
+-- ------------------------------------------------------
+-- Server version	5.7.22-log
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+--
+-- Table structure for table `news_detail`
+--
+DROP TABLE IF EXISTS `news_detail`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `news_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `typeid` int(11) DEFAULT NULL,
+  `title` varchar(255) COLLATE utf8_bin DEFAULT NULL,
+  `content` text COLLATE utf8_bin,
+  `addtime` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Dumping data for table `news_detail`
+--
+LOCK TABLES `news_detail` WRITE;
+/*!40000 ALTER TABLE `news_detail` DISABLE KEYS */;
+INSERT INTO `news_detail` VALUES (1,0,'后移动互联网时代我的一些思考','这篇文章本来是写在年前的，题目太大不好下手，加之年后公司上了一个新项目一直很忙，酝酿了好长时间，一直拖到了现在，今天也终于发表了，后移动时代我的一些思考，新时代下，我们不能只顾低头拉车，更要懂得抬头看路。就在半个多月前的2月15号，在滴滴年度员工大会上程维亲自宣布裁员2000人，而2月19号京东也宣布裁员10%的副总裁级别的高管，而就在昨天3月8日下午，熊猫直播在官方微博上宣布将关闭服务器，证实了此前有关熊猫直播倒闭的传言，等等这些消息只表明一个问题，移动互联网寒冬真的来了。其实从从去年开始一直就有各种消息爆出移动互联网行业的不景气，一些小公司由于投资方的撤资，资金链断裂，而导致的裁员、倒闭的情况，出现的就更早了','2019-06-15 21:42:36'),(2,0,'SpringCloud微服务架构在移动后端开发中的应用与研究','年前我写了一篇文章：Android组件化方案最佳实践，主要介绍了Android客户端框架FlyTour的使用，工程的架构为组件化，模块编码架构为MVP,文章地址为：https://blog.csdn.net/geduo_83/article/details/86604852，有的网友说现在自己一个人在做一个Android的项目，自己不会后端开发，问现在有没有好点的后端开源的架子给推荐一下，就自己稍加修改就能上手用的那种，为此我在网上找了一圈儿，还真没发现有什么好的后端架子，也许是我还没有发现，能不能自己搭建一个通用的后台服务端的架子？我想也很有必要，记得《Android第一行代码》作者郭霖有一句很著名的话“当你在感叹，假如有这么一个东西就好了的时候，请注意，这是你的机会”，正式因为这句话，我决定自己搭建一套后端服务的架子，希望对有需要的同学有所帮助','2019-06-15 21:42:36'),(3,0,'浅谈单一结构体项目的组件化改造','浅谈单一结构体项目的组件化改造\",content:\"昨天晚上一年一度的315晚会又来了，今年虽然没有哪家大公司上榜，但是曝光了一些黑心小企业，我们平时用的塑料盆、塑料袋、孩子的塑料玩具有可能都是用医疗废弃物，如输液袋、输液管、一次性注射器、血袋等加工而成的，还有平日孩子们抢着买的辣条这种混合了十几中添加剂的垃圾食品的生产环境着实让人辣眼睛，我们无比惊叹这些企业为了金钱、利益没有一点道德底线，等待他们的将是法律的制裁。好了，我们言归正传，项目功能移植可以说在日常开发中很多时候都会遇到，把A项目中的几个功能移植到B项目当中，最近工作中就有这样一个需求，需要将公司的一个老项目的几个功能模块移植到新项目当中，一开始以为工作量不是很大，但是随着改造工作的深入，不得不改变原有的移植改造方案','2019-06-15 21:42:36'),(4,0,'开发杂谈：Android移动应用架构发展简史','好了，我们言归正传，我们在前面几篇文章谈到了一些项目架构的问题，年前写了一篇“Android组件化最佳实践”，年后写了一篇“浅谈单一结构体项目的组件化改造”，我们提到了单一结构项目里，结构混乱，层次不清，有些模块同一功能解决方案不统一、有了新需求只是在原有项目上不断的砌代码罢了。长此以往，整个项目就是铁板一块，为后期的项目维护和扩展造成了极大的困难。我们在软件开发的时候，在做一个项目之前，架构师做工作就是搭项目框架，这是一个前提工作，给整个项目制定开发标准，开发规范，如果没有规范，项目可以搞起来吗？当然可以，就是个开发人员各行其是，最后的结果就是，项目做完了，整个项目结构混乱，层次不清。反之，一旦形成自己的一套框架体系，就可以长期使用，甚至成为整个公司的一套开发标准，大大提高后期的项目开发效率，来了新项目就直接可以在新项目中使用，而把主要的精力放在业务功能的实现上','2019-06-15 21:42:36'),(5,0,'Android事件分发机制的探索与发现之View篇','关于Android事件传递机制的文章在前面也零零散散的写过两篇，当时也是时间有限，也没有过多的去完善匆匆就发出去了。因为Android事件分发机制是整个Android系统的难点也是重点，说它是难点是因为触摸事件的流转流程错综复杂，前一阵子在有个技术群里面很多人都说，事件分发这块自己也是学习了好多次，但是都是过一阵子，对事件的流转流程又忘了，记不住，学了又忘，忘了又学，出现这种情况就是对事件流转流程理解不深刻，对书上的流程图死记硬背导致的，有些书上甚至出现流程错误的问题，真是误人子弟。','2019-06-15 21:42:36');
+/*!40000 ALTER TABLE `news_detail` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2019-06-23 23:14:00
--- a/sql/sys-news_news_type.sql
+++ b/sql/sys-news_news_type.sql
+-- MySQL dump 10.13  Distrib 5.7.17, for Win64 (x86_64)
+--
+-- Host: localhost    Database: sys-news
+-- ------------------------------------------------------
+-- Server version	5.7.22-log
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+--
+-- Table structure for table `news_type`
+--
+DROP TABLE IF EXISTS `news_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `news_type` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `addtime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `typename` varchar(255) COLLATE utf8_bin NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+/*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Dumping data for table `news_type`
+--
+LOCK TABLES `news_type` WRITE;
+/*!40000 ALTER TABLE `news_type` DISABLE KEYS */;
+INSERT INTO `news_type` VALUES (0,'2019-06-23 02:12:00','移动开发'),(1,'2019-06-23 02:12:00','大数据'),(2,'2019-06-23 02:12:00','人工智能'),(3,'2019-06-23 02:12:00','区块链'),(7,'2019-06-23 14:17:34','架构');
+/*!40000 ALTER TABLE `news_type` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2019-06-23 23:14:01
--- a/sql/sys-news_routines.sql
+++ b/sql/sys-news_routines.sql
+-- MySQL dump 10.13  Distrib 5.7.17, for Win64 (x86_64)
+--
+-- Host: localhost    Database: sys-news
+-- ------------------------------------------------------
+-- Server version	5.7.22-log
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+--
+-- Dumping events for database 'sys-news'
+--
+--
+-- Dumping routines for database 'sys-news'
+--
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+-- Dump completed on 2019-06-23 23:14:01