From ca39625665be46afa7df45ee77a4ac8915e6b5ff Mon Sep 17 00:00:00 2001
From: Lin-XCC <754310653@QQ.COM>
Date: Mon, 6 Jul 2020 16:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B7=E4=BD=93=E7=9A=84=E6=A1=86=E6=9E=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=82=20=E6=9B=B4=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=8C=E5=88=A0=E9=99=A4=E5=85=B7=E4=BD=93?=
 =?UTF-8?q?=E7=9A=84=E6=A1=86=E6=9E=B6=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                           |  4 +++
 .idea/jarRepositories.xml                     | 25 +++++++++++++++++++
 .idea/modules.xml                             |  1 -
 README.md                                     |  5 ++--
 .../src/main/resources/application-dev.yml    |  2 +-
 .../src/main/resources/application-prod.yml   |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 7 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 64658d1..91e658d 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,8 +3,12 @@
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-common" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-core" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-opc" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-opc/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/module-wcs" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/module-wcs/src/main/java" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..779e80a
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="public" />
+      <option name="name" value="aliyun nexus" />
+      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 2083066..68d1a79 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,7 +5,6 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/Wcs-renren.iml" filepath="$PROJECT_DIR$/.idea/Wcs-renren.iml" />
       <module fileurl="file://$PROJECT_DIR$/module-common/module-common.iml" filepath="$PROJECT_DIR$/module-common/module-common.iml" />
       <module fileurl="file://$PROJECT_DIR$/module-core/module-core.iml" filepath="$PROJECT_DIR$/module-core/module-core.iml" />
-      <module fileurl="file://$PROJECT_DIR$/module-core/module-core.iml" filepath="$PROJECT_DIR$/module-core/module-core.iml" />
       <module fileurl="file://$PROJECT_DIR$/module-opc/module-opc.iml" filepath="$PROJECT_DIR$/module-opc/module-opc.iml" />
       <module fileurl="file://$PROJECT_DIR$/module-wcs/module-wcs.iml" filepath="$PROJECT_DIR$/module-wcs/module-wcs.iml" />
       <module fileurl="file://$PROJECT_DIR$/module-wms/module-wms.iml" filepath="$PROJECT_DIR$/module-wms/module-wms.iml" />
diff --git a/README.md b/README.md
index da796ec..6548e05 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 - 预开发产品Wcs
-- 采用人人框架,多模块实现
-- Swagger-ui:http://localhost:8080/wcs-renren/swagger-ui.html#/
\ No newline at end of file
+- 采用多模块实现
+- 数据库为公司数据库produce_wcs
+- Swagger-ui地址:http://localhost:8080/wcs/swagger-ui.html#/
\ No newline at end of file
diff --git a/module-core/src/main/resources/application-dev.yml b/module-core/src/main/resources/application-dev.yml
index 169edff..785eeee 100644
--- a/module-core/src/main/resources/application-dev.yml
+++ b/module-core/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@ spring:
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
 #            url: jdbc:mysql://localhost:3306/wcs-renren?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-            url: jdbc:mysql://132.232.34.114:4277/wcs_renren?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            url: jdbc:mysql://132.232.34.114:4277/produce_wcs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: root
 #            password: 123456
             password: mt_qgs%wb*-20190430
diff --git a/module-core/src/main/resources/application-prod.yml b/module-core/src/main/resources/application-prod.yml
index 9a6c2cb..a38284f 100644
--- a/module-core/src/main/resources/application-prod.yml
+++ b/module-core/src/main/resources/application-prod.yml
@@ -3,7 +3,7 @@ spring:
         type: com.alibaba.druid.pool.DruidDataSource
         druid:
             driver-class-name: com.mysql.cj.jdbc.Driver
-            url: jdbc:mysql://localhost:3306/renren_fast?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+            url: jdbc:mysql://localhost:3306/produce_wcs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
             username: renren
             password: 123456
             initial-size: 10
diff --git a/module-core/src/main/resources/application.yml b/module-core/src/main/resources/application.yml
index a7c354a..20ee55d 100644
--- a/module-core/src/main/resources/application.yml
+++ b/module-core/src/main/resources/application.yml
@@ -7,7 +7,7 @@ server:
   port: 8080
   connection-timeout: 5000ms
   servlet:
-    context-path: /wcs-renren
+    context-path: /wcs
 
 spring:
   # 环境 dev|test|prod