From cb977d7d62f9bd5c56fb662a6e66a5402cadbca8 Mon Sep 17 00:00:00 2001
From: zzrdark <zzrdark@aliyun.com>
Date: Fri, 6 Mar 2020 17:59:53 +0800
Subject: [PATCH] 1.服务发现的Ip 2.配置文件
---
.idea/workspace.xml | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
cneeds-common-data/pom.xml | 1 +
cneeds-common-pojo/pom.xml | 2 +-
cneeds-common-utils/pom.xml | 2 +-
cneeds-server-authorization/Dockerfile | 4 ++--
cneeds-server-authorization/cneeds-server-authorization.iml | 2 --
cneeds-server-authorization/pom.xml | 2 +-
cneeds-server-authorization/src/main/resources/application-dev.yml | 7 +++++++
cneeds-server-authorization/src/main/resources/application.properties | 8 --------
cneeds-server-authorization/src/main/resources/application.yml | 12 ++++++++++++
cneeds-server-datashow/Dockerfile | 3 ++-
cneeds-server-datashow/pom.xml | 1 +
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java | 1 -
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java | 1 +
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java | 2 +-
cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java | 5 ++---
cneeds-server-datashow/src/main/resources/application-dev.yml | 2 ++
cneeds-server-eureka/Dockerfile | 4 ++--
cneeds-server-eureka/pom.xml | 2 +-
cneeds-server-eureka/src/main/resources/application-dev.yml | 13 +++++++++++++
cneeds-server-eureka/src/main/resources/application.yml | 2 ++
cneeds-server-user/Dockerfile | 5 +++--
cneeds-server-user/src/main/resources/applicaiton-dev.yml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
cneeds-server-user/src/main/resources/application.yml | 52 ++--------------------------------------------------
24 files changed, 225 insertions(+), 151 deletions(-)
delete mode 100644 cneeds-server-authorization/cneeds-server-authorization.iml
create mode 100644 cneeds-server-authorization/src/main/resources/application-dev.yml
delete mode 100644 cneeds-server-authorization/src/main/resources/application.properties
create mode 100644 cneeds-server-authorization/src/main/resources/application.yml
create mode 100644 cneeds-server-eureka/src/main/resources/application-dev.yml
create mode 100644 cneeds-server-user/src/main/resources/applicaiton-dev.yml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5dad7cb..5787cc4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,19 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/UserInfoVo.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/filter/CrossFilter.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" afterDir="false" />
+ <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="1.修改项目结构 2.登陆 3.等等">
+ <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application-dev.yml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application-dev.yml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/applicaiton-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/JwtToken.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/JwtToken.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-common-data/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-common-pojo/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/pom.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/result/R.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/result/R.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/Dockerfile" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/cneeds-server-authorization.iml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.properties" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/Dockerfile" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-dev.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-eureka/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/Dockerfile" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-user/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/Dockerfile" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,8 +73,8 @@
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
- <option name="mavenHome" value="D:/ENV/apache-maven-3.6.1" />
- <option name="userSettingsFile" value="D:\ENV\apache-maven-3.6.1\conf\settings.xml" />
+ <option name="mavenHome" value="$USER_HOME$/environment/apache-maven-3.6.0" />
+ <option name="userSettingsFile" value="$USER_HOME$/environment/apache-maven-3.6.0/conf/settings.xml" />
</MavenGeneralSettings>
</option>
</component>
@@ -83,6 +95,7 @@
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
+ <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
@@ -92,15 +105,16 @@
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2916053" />
- <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+ <property name="settings.editor.selected.configurable" value="MavenSettings" />
<property name="settings.editor.splitter.proportion" value="0.20898877" />
</component>
<component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
- <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
- <recent name="E:\mx_project\cneeds-server" />
- <recent name="E:\mx_project\cneeds-server\src" />
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow" />
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\service" />
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\java\com\mx\cneeds\server\device\service" />
+ <recent name="E:\mx_project\cneeds-server\cneeds-common-pojo\src\main\java" />
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.datashow.filter" />
@@ -109,15 +123,34 @@
<recent name="com.mx.cneeds.common" />
<recent name="com.mx.cneeds.common.result" />
</key>
- <key name="CopyFile.RECENT_KEYS">
- <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds\server\datashow" />
- <recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\java\com\mx\cneeds\server\user\service" />
- <recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\java\com\mx\cneeds\server\device\service" />
- <recent name="E:\mx_project\cneeds-server\cneeds-common-pojo\src\main\java" />
- <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow" />
+ <key name="MoveFile.RECENT_KEYS">
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
+ <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
+ <recent name="E:\mx_project\cneeds-server" />
+ <recent name="E:\mx_project\cneeds-server\src" />
</key>
</component>
<component name="RunManager" selected="Spring Boot.DatashowApplication">
+ <configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
+ <module name="cneeds-server-eureka" />
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
+ <configuration name="RequestParamterConverter" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+ <option name="MAIN_CLASS_NAME" value="com.mx.cneeds.common.converter.RequestParamterConverter" />
+ <module name="cneeds-common-utils" />
+ <extension name="coverage">
+ <pattern>
+ <option name="PATTERN" value="com.mx.cneeds.common.converter.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <method v="2">
+ <option name="Make" enabled="true" />
+ </method>
+ </configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<module name="cneeds-server-advice-control" />
<option name="VM_PARAMETERS" />
@@ -165,26 +198,6 @@
<option name="Make" enabled="true" />
</method>
</configuration>
- <configuration name="EurekaServerApplication" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.mx.cneeds.server.eureka.EurekaServerApplication" />
- <module name="cneeds-server-eureka" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration name="RequestParamterConverter" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME" value="com.mx.cneeds.common.converter.RequestParamterConverter" />
- <module name="cneeds-common-utils" />
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="com.mx.cneeds.common.converter.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
<configuration name="AuthorizaitonApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="cneeds-server-authorization" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.mx.cneeds.server.anthorization.AuthorizaitonApplication" />
@@ -265,6 +278,9 @@
<workItem from="1583320312435" duration="9970000" />
<workItem from="1583395022330" duration="616000" />
<workItem from="1583395719361" duration="15264000" />
+ <workItem from="1583477272057" duration="183000" />
+ <workItem from="1583477731081" duration="6700000" />
+ <workItem from="1583485000764" duration="3436000" />
</task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 2.增加一个logupload">
<created>1578451117064</created>
@@ -338,10 +354,11 @@
<option name="LAST_COMMIT_MESSAGE" value="1.修改项目结构 2.登陆 3.等等" />
</component>
<component name="WindowStateProjectService">
- <state x="552" y="178" key="#Project_Structure" timestamp="1583316360973">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state x="483" y="199" key="#Project_Structure" timestamp="1583483296021">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state x="552" y="178" key="#Project_Structure/0.0.1920.1040@0.0.1920.1040" timestamp="1583316360973" />
+ <state x="483" y="199" key="#Project_Structure/0.23.1680.1027@0.23.1680.1027" timestamp="1583483296021" />
<state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1583390885636">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -358,58 +375,75 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1583224455231" />
- <state x="463" y="112" key="CommitChangelistDialog2" timestamp="1583325330372">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state x="405" y="134" key="CommitChangelistDialog2" timestamp="1583483819735">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1583325330372" />
- <state width="1877" height="386" key="GridCell.Tab.0.bottom" timestamp="1583416459517">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state x="405" y="134" key="CommitChangelistDialog2/0.23.1680.1027@0.23.1680.1027" timestamp="1583483819735" />
+ <state x="294" y="139" key="DiffContextDialog" timestamp="1583483818288">
+ <screen x="0" y="23" width="1680" height="1027" />
+ </state>
+ <state x="294" y="139" key="DiffContextDialog/0.23.1680.1027@0.23.1680.1027" timestamp="1583483818288" />
+ <state width="1638" height="139" key="GridCell.Tab.0.bottom" timestamp="1583488675893">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="386" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583416459517" />
- <state width="1877" height="386" key="GridCell.Tab.0.center" timestamp="1583416459517">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="139" key="GridCell.Tab.0.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1583488675893" />
+ <state width="1638" height="139" key="GridCell.Tab.0.center" timestamp="1583488675893">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="386" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583416459517" />
- <state width="1877" height="386" key="GridCell.Tab.0.left" timestamp="1583416459517">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="139" key="GridCell.Tab.0.center/0.23.1680.1027@0.23.1680.1027" timestamp="1583488675893" />
+ <state width="1638" height="139" key="GridCell.Tab.0.left" timestamp="1583488675892">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="386" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583416459517" />
- <state width="1877" height="386" key="GridCell.Tab.0.right" timestamp="1583416459517">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="139" key="GridCell.Tab.0.left/0.23.1680.1027@0.23.1680.1027" timestamp="1583488675892" />
+ <state width="1638" height="139" key="GridCell.Tab.0.right" timestamp="1583488675893">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="386" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583416459517" />
- <state width="1877" height="338" key="GridCell.Tab.1.bottom" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="139" key="GridCell.Tab.0.right/0.23.1680.1027@0.23.1680.1027" timestamp="1583488675893" />
+ <state width="1638" height="345" key="GridCell.Tab.1.bottom" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.1.center" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.1.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.1.center" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.1.left" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.1.center/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.1.left" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.1.right" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.1.left/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.1.right" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.2.bottom" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.1.right/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.2.bottom" timestamp="1583488634807">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.2.center" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.2.bottom/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634807" />
+ <state width="1638" height="345" key="GridCell.Tab.2.center" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.2.left" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.2.center/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.2.left" timestamp="1583488634806">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
- <state width="1877" height="338" key="GridCell.Tab.2.right" timestamp="1583407423488">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state width="1638" height="345" key="GridCell.Tab.2.left/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634806" />
+ <state width="1638" height="345" key="GridCell.Tab.2.right" timestamp="1583488634807">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state width="1877" height="338" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1583407423488" />
+ <state width="1638" height="345" key="GridCell.Tab.2.right/0.23.1680.1027@0.23.1680.1027" timestamp="1583488634807" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" />
</state>
@@ -418,22 +452,28 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="600" y="217" key="NewModule_or_Project.wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1582699806601" />
- <state x="438" y="166" width="1352" height="708" key="SettingsEditor" timestamp="1583395654566">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state x="383" y="187" width="1183" height="722" key="SettingsEditor" timestamp="1583479490341">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583395654566" />
+ <state x="383" y="187" width="1183" height="722" key="SettingsEditor/0.23.1680.1027@0.23.1680.1027" timestamp="1583479490341" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1583325340355">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1583325340355" />
+ <state x="449" y="262" width="962" height="472" key="find.popup" timestamp="1583485196950">
+ <screen x="0" y="23" width="1680" height="1027" />
+ </state>
+ <state x="449" y="262" width="962" height="472" key="find.popup/0.23.1680.1027@0.23.1680.1027" timestamp="1583485196950" />
<state x="511" y="210" key="new project wizard" timestamp="1583318693876">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" />
- <state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1583314608796">
- <screen x="0" y="0" width="1920" height="1040" />
+ <state x="539" y="194" width="670" height="668" key="search.everywhere.popup" timestamp="1583485574280">
+ <screen x="0" y="23" width="1680" height="1027" />
</state>
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1583314608796" />
+ <state x="539" y="194" width="670" height="668" key="search.everywhere.popup/0.23.1680.1027@0.23.1680.1027" timestamp="1583485574280" />
</component>
<component name="XDebuggerManager">
<watches-manager>
diff --git a/cneeds-common-data/pom.xml b/cneeds-common-data/pom.xml
index b0f2267..e0cbac7 100644
--- a/cneeds-common-data/pom.xml
+++ b/cneeds-common-data/pom.xml
@@ -9,6 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
+ <version>1.0-SNAPSHOT</version>
<artifactId>cneeds-common-data</artifactId>
<packaging>jar</packaging>
<properties>
diff --git a/cneeds-common-pojo/pom.xml b/cneeds-common-pojo/pom.xml
index 3b1da92..8cbf350 100644
--- a/cneeds-common-pojo/pom.xml
+++ b/cneeds-common-pojo/pom.xml
@@ -11,7 +11,7 @@
<packaging>jar</packaging>
-
+ <version>1.0-SNAPSHOT</version>
<artifactId>cneeds-common-pojo</artifactId>
diff --git a/cneeds-common-utils/pom.xml b/cneeds-common-utils/pom.xml
index 4ac0be3..be837eb 100644
--- a/cneeds-common-utils/pom.xml
+++ b/cneeds-common-utils/pom.xml
@@ -8,7 +8,7 @@
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<artifactId>cneeds-common-utils</artifactId>
diff --git a/cneeds-server-authorization/Dockerfile b/cneeds-server-authorization/Dockerfile
index a8e192f..322155f 100644
--- a/cneeds-server-authorization/Dockerfile
+++ b/cneeds-server-authorization/Dockerfile
@@ -1,5 +1,5 @@
-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
MAINTAINER XXX XXX@imooc.com
ADD target/*.jar app.jar
diff --git a/cneeds-server-authorization/cneeds-server-authorization.iml b/cneeds-server-authorization/cneeds-server-authorization.iml
deleted file mode 100644
index 78b2cc5..0000000
--- a/cneeds-server-authorization/cneeds-server-authorization.iml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/cneeds-server-authorization/pom.xml b/cneeds-server-authorization/pom.xml
index 2c6f4dc..23d48bf 100644
--- a/cneeds-server-authorization/pom.xml
+++ b/cneeds-server-authorization/pom.xml
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>cneeds-server-authorization</artifactId>
<packaging>jar</packaging>
-
+ <version>1.0-SNAPSHOT</version>
<dependencies>
<!-- eureka-client -->
diff --git a/cneeds-server-authorization/src/main/resources/application-dev.yml b/cneeds-server-authorization/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..102e76b
--- /dev/null
+++ b/cneeds-server-authorization/src/main/resources/application-dev.yml
@@ -0,0 +1,7 @@
+eureka:
+ client:
+ service-url:
+ defaultZone: http://192.168.2.244:8761/eureka/
+ instance:
+ prefer-ip-address: true
+ ip-address: 192.168.2.244
\ No newline at end of file
diff --git a/cneeds-server-authorization/src/main/resources/application.properties b/cneeds-server-authorization/src/main/resources/application.properties
deleted file mode 100644
index 660465a..0000000
--- a/cneeds-server-authorization/src/main/resources/application.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-server.port=8861
-server.servlet.context-path=/
-
-spring.application.name= cneeds-server-authorization
-
-
-eureka.client.service-url.defaultZone= http://192.168.2.244:8761/eureka/
-eureka.instance.prefer-ip-address=true
\ No newline at end of file
diff --git a/cneeds-server-authorization/src/main/resources/application.yml b/cneeds-server-authorization/src/main/resources/application.yml
new file mode 100644
index 0000000..9e6348b
--- /dev/null
+++ b/cneeds-server-authorization/src/main/resources/application.yml
@@ -0,0 +1,12 @@
+spring:
+ profiles:
+ active: dev
+ application:
+ name: cneeds-server-authorization
+server:
+ port: 8861
+ servlet:
+ context-path: /
+
+
+
diff --git a/cneeds-server-datashow/Dockerfile b/cneeds-server-datashow/Dockerfile
index a8e192f..701c522 100644
--- a/cneeds-server-datashow/Dockerfile
+++ b/cneeds-server-datashow/Dockerfile
@@ -1,4 +1,5 @@
-FROM hub.c.163.com/library/java:8-alpine
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
MAINTAINER XXX XXX@imooc.com
diff --git a/cneeds-server-datashow/pom.xml b/cneeds-server-datashow/pom.xml
index 790c4d1..85ff290 100644
--- a/cneeds-server-datashow/pom.xml
+++ b/cneeds-server-datashow/pom.xml
@@ -11,6 +11,7 @@
<artifactId>cneeds-server-datashow</artifactId>
<packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
<dependencies>
diff --git a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java
index 9fdfe36..e25cf37 100644
--- a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java
+++ b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/FeignInterceptor.java
@@ -34,7 +34,6 @@ public class FeignInterceptor implements RequestInterceptor {
if (request.getRequestURL().toString().contains("/user/login")){
String authString = RequestParamterConverter.authorizationConverter("clientapp","112233");
requestTemplate.header("Authorization",authString);
- System.out.println(authString);
}
}
}
diff --git a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java
index 4a97f1d..dbbf75d 100644
--- a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java
+++ b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/OAuth2ResourceServer.java
@@ -20,6 +20,7 @@ public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter {
http.authorizeRequests()
.antMatchers("/user/login",
"/device/getChannel_nums",
+// "/user/info",
"/statics/**")
.permitAll()
// 开启认证
diff --git a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java
index aa67e42..689eaae 100644
--- a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java
+++ b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/config/WebConfig.java
@@ -30,7 +30,7 @@ public class WebConfig implements WebMvcConfigurer {
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOrigins("*")
- .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS")
+ .allowedMethods("GET", "HEAD", "POST", "PUT", "DELETE", "OPTIONS","AUTHORIZATION")
.allowCredentials(true)
.maxAge(3600)
.allowedHeaders("*");
diff --git a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java
index 5d129d2..e926be0 100644
--- a/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java
+++ b/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/user/UserController.java
@@ -42,15 +42,14 @@ public class UserController {
}
@RequestMapping("/info")
- public UserInfoVo getInfo(){
-
+ public R getInfo(){
UserInfoVo userInfoVo = new UserInfoVo();
log.info("getInfo");
userInfoVo.setName("admin");
userInfoVo.setIntroduction("manager");
userInfoVo.setRoles("admin");
userInfoVo.setAvatar("avatar");
- return userInfoVo;
+ return new R().put("data",userInfoVo);
}
}
diff --git a/cneeds-server-datashow/src/main/resources/application-dev.yml b/cneeds-server-datashow/src/main/resources/application-dev.yml
index 8d84068..5c9c022 100644
--- a/cneeds-server-datashow/src/main/resources/application-dev.yml
+++ b/cneeds-server-datashow/src/main/resources/application-dev.yml
@@ -4,3 +4,5 @@ eureka:
defaultZone: http://192.168.2.244:8761/eureka/
instance:
prefer-ip-address: true
+ # ip-address: 192.168.2.244
+
diff --git a/cneeds-server-eureka/Dockerfile b/cneeds-server-eureka/Dockerfile
index a8e192f..322155f 100644
--- a/cneeds-server-eureka/Dockerfile
+++ b/cneeds-server-eureka/Dockerfile
@@ -1,5 +1,5 @@
-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+FROM openjdk:8
MAINTAINER XXX XXX@imooc.com
ADD target/*.jar app.jar
diff --git a/cneeds-server-eureka/pom.xml b/cneeds-server-eureka/pom.xml
index a3d9d67..8ac2a25 100644
--- a/cneeds-server-eureka/pom.xml
+++ b/cneeds-server-eureka/pom.xml
@@ -11,7 +11,7 @@
<artifactId>cneeds-server-eureka</artifactId>
<packaging>jar</packaging>
-
+ <version>1.0-SNAPSHOT</version>
<dependencies>
diff --git a/cneeds-server-eureka/src/main/resources/application-dev.yml b/cneeds-server-eureka/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..7813f93
--- /dev/null
+++ b/cneeds-server-eureka/src/main/resources/application-dev.yml
@@ -0,0 +1,13 @@
+eureka:
+ client:
+ service-url:
+ #defaultZone: http://eureka2:8762/eureka/
+ defaultZone: http://localhost:8761/eureka/
+ ## 单机的时候开启
+ register-with-eureka: false
+ fetch-registry: 'false'
+ # server:
+ # enable-self-preservation: false
+ instance:
+ prefer-ip-address: true
+ ip-address: 192.168.2.244
\ No newline at end of file
diff --git a/cneeds-server-eureka/src/main/resources/application.yml b/cneeds-server-eureka/src/main/resources/application.yml
index 34f9064..5f847ea 100644
--- a/cneeds-server-eureka/src/main/resources/application.yml
+++ b/cneeds-server-eureka/src/main/resources/application.yml
@@ -12,6 +12,8 @@ eureka:
prefer-ip-address: true
spring:
+ profiles:
+ active: dev
application:
name: cneeds-server-eureka
server:
diff --git a/cneeds-server-user/Dockerfile b/cneeds-server-user/Dockerfile
index a8e192f..25c3f73 100644
--- a/cneeds-server-user/Dockerfile
+++ b/cneeds-server-user/Dockerfile
@@ -1,5 +1,6 @@
-FROM hub.c.163.com/library/java:8-alpine
-
+#FROM hub.c.163.com/library/java:8-alpine
+#FROM hub.c.163.com/library/java:8-jre
+FROM openjdk:8
MAINTAINER XXX XXX@imooc.com
ADD target/*.jar app.jar
diff --git a/cneeds-server-user/src/main/resources/applicaiton-dev.yml b/cneeds-server-user/src/main/resources/applicaiton-dev.yml
new file mode 100644
index 0000000..778548c
--- /dev/null
+++ b/cneeds-server-user/src/main/resources/applicaiton-dev.yml
@@ -0,0 +1,53 @@
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+ password: cneeds!QAZ1qaz
+ username: root
+# hikari:
+# driver-class-name: com.mysql.jdbc.Driver
+# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+# username: root
+# password: cneeds!QAZ1qaz
+# datasource:
+# type: com.alibaba.druid.pool.DruidDataSource
+# druid:
+# driver-class-name: com.mysql.jdbc.Driver
+# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+# username: root
+# password: cneeds!QAZ1qaz
+# initial-size: 10
+# max-active: 100
+# min-idle: 10
+# max-wait: 60000
+# pool-prepared-statements: true
+# max-pool-prepared-statement-per-connection-size: 20
+# time-between-eviction-runs-millis: 60000
+# min-evictable-idle-time-millis: 300000
+# #Oracle需要打开注释
+# #validation-query: SELECT 1 FROM DUAL
+# test-while-idle: true
+# test-on-borrow: false
+# test-on-return: false
+# stat-view-servlet:
+# enabled: true
+# url-pattern: /druid/*
+# #login-username: admin
+# #login-password: admin
+# filter:
+# stat:
+# log-slow-sql: true
+# slow-sql-millis: 1000
+# merge-sql: false
+# wall:
+# config:
+# multi-statement-allow: true
+
+
+eureka:
+ client:
+ service-url:
+ defaultZone: http://192.168.2.244:8761/eureka/
+ instance:
+ prefer-ip-address: true
+ ip-address: 192.168.2.244
\ No newline at end of file
diff --git a/cneeds-server-user/src/main/resources/application.yml b/cneeds-server-user/src/main/resources/application.yml
index 1654739..73f92da 100644
--- a/cneeds-server-user/src/main/resources/application.yml
+++ b/cneeds-server-user/src/main/resources/application.yml
@@ -1,57 +1,9 @@
spring:
+ profiles:
+ active: dev
application:
name: cneeds-server-user
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
- password: cneeds!QAZ1qaz
- username: root
-# hikari:
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-# username: root
-# password: cneeds!QAZ1qaz
-# datasource:
-# type: com.alibaba.druid.pool.DruidDataSource
-# druid:
-# driver-class-name: com.mysql.jdbc.Driver
-# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-# username: root
-# password: cneeds!QAZ1qaz
-# initial-size: 10
-# max-active: 100
-# min-idle: 10
-# max-wait: 60000
-# pool-prepared-statements: true
-# max-pool-prepared-statement-per-connection-size: 20
-# time-between-eviction-runs-millis: 60000
-# min-evictable-idle-time-millis: 300000
-# #Oracle需要打开注释
-# #validation-query: SELECT 1 FROM DUAL
-# test-while-idle: true
-# test-on-borrow: false
-# test-on-return: false
-# stat-view-servlet:
-# enabled: true
-# url-pattern: /druid/*
-# #login-username: admin
-# #login-password: admin
-# filter:
-# stat:
-# log-slow-sql: true
-# slow-sql-millis: 1000
-# merge-sql: false
-# wall:
-# config:
-# multi-statement-allow: true
-
-eureka:
- client:
- service-url:
- defaultZone: http://192.168.2.244:8761/eureka/
- instance:
- prefer-ip-address: true
server:
port: 9001
servlet:
--
libgit2 0.26.0