Răsfoiți Sursa

init config

wangqi49 2 luni în urmă
părinte
comite
93b232ed35
55 a modificat fișierele cu 703 adăugiri și 433 ștergeri
  1. 9 3
      .idea/compiler.xml
  2. 3 1
      .idea/encodings.xml
  3. 20 0
      .idea/jarRepositories.xml
  4. 3 0
      .idea/misc.xml
  5. 124 0
      .idea/uiDesigner.xml
  6. 143 311
      pom.xml
  7. 0 19
      webchat-api/.mvn/wrapper/maven-wrapper.properties
  8. 0 13
      webchat-api/src/main/java/com/webchat/api/WebchatApiApplication.java
  9. 0 1
      webchat-api/src/main/resources/application.properties
  10. 7 0
      webchat-common/pom.xml
  11. 50 0
      webchat-common/src/main/java/com/webchat/bean/APIPageResponseBean.java
  12. 20 0
      webchat-common/src/main/java/com/webchat/bean/APIResponseBean.java
  13. 49 0
      webchat-common/src/main/java/com/webchat/bean/APIResponseBeanUtil.java
  14. BIN
      webchat-common/target/classes/com/webchat/bean/APIPageResponseBean.class
  15. BIN
      webchat-common/target/classes/com/webchat/bean/APIResponseBean.class
  16. BIN
      webchat-common/target/classes/com/webchat/bean/APIResponseBeanUtil.class
  17. 3 0
      webchat-domain/target/maven-archiver/pom.properties
  18. 0 0
      webchat-domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  19. BIN
      webchat-domain/target/webchat-domain-1.0-SNAPSHOT.jar
  20. BIN
      webchat-domain/target/webchat-domain-1.0-SNAPSHOT.jar.original
  21. 0 42
      webchat-eurake/pom.xml
  22. 0 20
      webchat-eurake/src/main/java/com/webchat/webchateurake/WebchatEurakeApplication.java
  23. 0 1
      webchat-eurake/src/main/resources/application.properties
  24. 62 0
      webchat-pay/pom.xml
  25. 15 0
      webchat-pay/src/main/java/com/webchat/pay/WebchatPayApplication.java
  26. 20 0
      webchat-pay/src/main/java/com/webchat/pay/controller/PayServiceController.java
  27. 23 0
      webchat-pay/src/main/resources/application.yml
  28. 2 2
      webchat-pay/src/test/java/com/webchat/pgc/WebchatPgcApplicationTests.java
  29. 23 0
      webchat-pay/target/classes/application.yml
  30. BIN
      webchat-pay/target/classes/com/webchat/pay/WebchatPayApplication.class
  31. BIN
      webchat-pay/target/classes/com/webchat/pay/controller/PayServiceController.class
  32. 0 13
      webchat-pgc/pom.xml
  33. 2 0
      webchat-pgc/src/main/java/com/webchat/pgc/WebchatPGCApplication.java
  34. 0 1
      webchat-pgc/src/main/resources/application.properties
  35. 23 0
      webchat-pgc/src/main/resources/application.yml
  36. 23 0
      webchat-pgc/target/classes/application.yml
  37. BIN
      webchat-pgc/target/classes/com/webchat/pgc/WebchatPGCApplication.class
  38. 9 1
      webchat-remote/pom.xml
  39. 17 0
      webchat-remote/src/main/java/com/webchat/rmi/pay/PayServiceClient.java
  40. BIN
      webchat-remote/target/classes/com/webchat/rmi/pay/PayServiceClient.class
  41. 19 4
      webchat-search/pom.xml
  42. 13 0
      webchat-search/src/main/java/com/webchat/pay/WebchatSearchApplication.java
  43. 0 0
      webchat-search/src/main/resources/application.properties
  44. 13 0
      webchat-search/src/test/java/com/webchat/pgc/WebchatPgcApplicationTests.java
  45. 1 0
      webchat-search/target/classes/application.properties
  46. BIN
      webchat-search/target/classes/com/webchat/pay/WebchatSearchApplication.class
  47. 1 0
      webchat-sso/target/classes/application.properties
  48. BIN
      webchat-sso/target/classes/com/webchat/web/WebchatSSOApplication.class
  49. 3 0
      webchat-sso/target/maven-archiver/pom.properties
  50. 1 0
      webchat-sso/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
  51. 1 0
      webchat-sso/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  52. BIN
      webchat-sso/target/webchat-sso-0.0.1-SNAPSHOT.jar
  53. BIN
      webchat-sso/target/webchat-sso-0.0.1-SNAPSHOT.jar.original
  54. 1 1
      webchat-user/src/main/java/com/webchat/pay/WebchatUserApplication.java
  55. BIN
      webchat-user/target/classes/com/webchat/user/WebchatUserApplication.class

+ 9 - 3
.idea/compiler.xml

@@ -10,17 +10,21 @@
         <module name="webchat-remote" />
         <module name="webchat-connect" />
         <module name="webchat-common" />
-        <module name="webchat-api" />
         <module name="webchat-domain" />
         <module name="webchat-user" />
+        <module name="webchat-pay" />
+        <module name="webchat-search" />
         <module name="webchat-aigc" />
         <module name="webchat-sso" />
         <module name="webchat-client" />
-        <module name="webchat-eurake" />
         <module name="webchat-pgc" />
         <module name="webchat-admin" />
       </profile>
     </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="webchat-api" target="17" />
+      <module name="webchat-nacos" target="17" />
+    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
@@ -31,9 +35,11 @@
       <module name="webchat-common" options="-parameters" />
       <module name="webchat-connect" options="-parameters" />
       <module name="webchat-domain" options="-parameters" />
-      <module name="webchat-eurake" options="-parameters" />
+      <module name="webchat-nacos" options="-parameters" />
+      <module name="webchat-pay" options="-parameters" />
       <module name="webchat-pgc" options="-parameters" />
       <module name="webchat-remote" options="-parameters" />
+      <module name="webchat-search" options="-parameters" />
       <module name="webchat-sso" options="-parameters" />
       <module name="webchat-ugc" options="-parameters" />
       <module name="webchat-user" options="-parameters" />

+ 3 - 1
.idea/encodings.xml

@@ -10,9 +10,11 @@
     <file url="file://$PROJECT_DIR$/webchat-common/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-connect/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-domain/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/webchat-eurake/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/webchat-nacos/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/webchat-pay/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-pgc/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-remote/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/webchat-search/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-sso/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-ugc/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webchat-user/src/main/java" charset="UTF-8" />

+ 20 - 0
.idea/jarRepositories.xml

@@ -17,16 +17,36 @@
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="aliyunmaven" />
+      <option name="name" value="aliyun" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="baidu-nexus-snapshot" />
       <option name="name" value="baidu-nexus-snapshot" />
       <option name="url" value="https://maven.baidu-int.com/nexus/content/groups/public-snapshots" />
     </remote-repository>
     <remote-repository>
+      <option name="id" value="central2" />
+      <option name="name" value="central2" />
+      <option name="url" value="https://repo1.maven.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="central" />
+      <option name="url" value="https://repo1.maven.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="aliyun" />
+      <option name="name" value="aliyun" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
+    <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />

+ 3 - 0
.idea/misc.xml

@@ -16,10 +16,13 @@
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/webchat-api/pom.xml" />
         <option value="$PROJECT_DIR$/webchat-client/pom.xml" />
+        <option value="$PROJECT_DIR$/webchat-search/pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">
       <set>
+        <option value="$PROJECT_DIR$/webchat-api/pom.xml" />
+        <option value="$PROJECT_DIR$/webchat-nacos/pom.xml" />
         <option value="$PROJECT_DIR$/webchat-web/pom.xml" />
       </set>
     </option>

+ 124 - 0
.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

+ 143 - 311
pom.xml

@@ -1,314 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.11</version>
-	</parent>
-
-	<groupId>com.webchat</groupId>
-	<artifactId>webchat</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<name>webchat</name>
-	<description>web chat spring cloud</description>
-
-	<modules>
-		<module>webchat-api</module>
-		<module>webchat-sso</module>
-		<module>webchat-domain</module>
-		<module>webchat-common</module>
-		<module>webchat-remote</module>
-		<module>webchat-pgc</module>
-		<module>webchat-ugc</module>
-		<module>webchat-aigc</module>
-		<module>webchat-connect</module>
-		<module>webchat-eurake</module>
-		<module>webchat-user</module>
-		<module>webchat-client</module>
-		<module>webchat-admin</module>
-
-	</modules>
-
-	<properties>
-		<project.build.jdk>17</project.build.jdk>
-		<java.version>17</java.version>
-		<lombok.version>1.18.26</lombok.version>
-		<tomcat.version>9.0.33</tomcat.version>
-		<commonslang3.verison>3.8.1</commonslang3.verison>
-		<common.io.version>2.4</common.io.version>
-		<common.codec.version>1.9</common.codec.version>
-		<common.file.version>1.3</common.file.version>
-		<commons.collections.version>3.2.1</commons.collections.version>
-		<httpclient.version>4.5.1</httpclient.version>
-		<httpmime.version>4.5.1</httpmime.version>
-		<fastjson.version>1.2.41</fastjson.version>
-		<httpcore-version>4.4</httpcore-version>
-		<httpclient-version>4.5</httpclient-version>
-		<commons-logging-version>1.1.3</commons-logging-version>
-		<logback-classic-version>1.2.3</logback-classic-version>
-		<log4j-version>1.2.16</log4j-version>
-		<guava-version>20.0</guava-version>
-		<httpcomponents-version>4.5.6</httpcomponents-version>
-		<commons-collections4-version>4.1</commons-collections4-version>
-		<mapper.version>4.0.0</mapper.version>
-		<elasticsearch.version>7.4.2</elasticsearch.version>
-		<!-- 适合JDK8 打包 -->
-<!--		<lombok.version>1.18.10</lombok.version>-->
-		<!-- 高版本JDK打包 -->
-		<lombok.version>1.18.30</lombok.version>
-	</properties>
-
-	<dependencies>
-
-		<!-- 二维码 -->
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>core</artifactId>
-			<version>3.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.zxing</groupId>
-			<artifactId>javase</artifactId>
-			<version>3.1.0</version>
-		</dependency>
-
-		<!-- 添加依赖 -->
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-juli</artifactId>
-			<version>${tomcat.version}</version>
-		</dependency>
-
-		<!-- 添加依赖 -->
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>4.12.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>2.0.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.reactivex.rxjava2</groupId>
-			<artifactId>rxjava</artifactId>
-			<version>2.2.21</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
-		</dependency>
-
-		<!-- ################################### 第三方依赖 ################################### -->
-		<!-- 阿里巴巴FastJson -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
-		</dependency>
-
-		<!-- Hack:确保commons-logging的jar包不被引入,否则将和jcl-over-slf4j冲突 -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>${commons-logging-version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- slf4j的实现:logback,用来取代log4j。更快、更强! -->
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback-classic-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>${log4j-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.6</version>
-		</dependency>
-
-		<!--lombok-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<!-- guava -->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-			<version>1.5.2.RELEASE</version>
-		</dependency>
-
-		<!-- http client -->
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>${httpcore-version}</version>
-		</dependency>
-
-		<!-- swagger相关-->
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger2</artifactId>
-			<version>2.9.2</version>
-		</dependency>
-		<dependency>
-			<groupId>io.springfox</groupId>
-			<artifactId>springfox-swagger-ui</artifactId>
-			<version>2.9.2</version>
-		</dependency>
-
-		<!-- 引入common包-->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>${commonslang3.verison}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>${common.io.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>${common.file.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>${commons.collections.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>${common.codec.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>${httpclient.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpmime</artifactId>
-			<version>${httpmime.version}</version>
-		</dependency>
-
-		<!-- ################################### 集成websocket ################################### -->
-		<!-- 引入 websocket 依赖类-->
-		<!-- Springboot对websocket的能力支持-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-websocket</artifactId>
-		</dependency>
-		<!-- ServerEndpoint注解来自于javax.websocket-api这个包 -->
-		<dependency>
-			<groupId>javax.websocket</groupId>
-			<artifactId>javax.websocket-api</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- tomcat服务队websocket的支持 -->
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-websocket</artifactId>
-			<version>9.0.33</version>
-		</dependency>
-
-		<!-- ################################### Spring、Spring Boot依赖 ################################### -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-freemarker</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>lucene-core</groupId>
-					<artifactId>org.apache.lucene</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.2.0</version>
+    </parent>
+
+    <groupId>com.webchat</groupId>
+    <artifactId>webchat</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>webchat</name>
+    <description>web chat spring cloud</description>
+
+    <modules>
+        <module>webchat-sso</module>
+        <module>webchat-domain</module>
+        <module>webchat-common</module>
+        <module>webchat-remote</module>
+        <module>webchat-pgc</module>
+        <module>webchat-ugc</module>
+        <module>webchat-aigc</module>
+        <module>webchat-connect</module>
+        <module>webchat-user</module>
+        <module>webchat-client</module>
+        <module>webchat-admin</module>
+        <module>webchat-pay</module>
+        <module>webchat-search</module>
+    </modules>
+
+    <properties>
+        <project.build.jdk>17</project.build.jdk>
+        <java.version>17</java.version>
+        <lombok.version>1.18.26</lombok.version>
+        <tomcat.version>9.0.33</tomcat.version>
+        <commonslang3.verison>3.8.1</commonslang3.verison>
+        <common.io.version>2.4</common.io.version>
+        <common.codec.version>1.9</common.codec.version>
+        <common.file.version>1.3</common.file.version>
+        <commons.collections.version>3.2.1</commons.collections.version>
+        <httpclient.version>4.5.1</httpclient.version>
+        <httpmime.version>4.5.1</httpmime.version>
+        <fastjson.version>1.2.41</fastjson.version>
+        <httpcore-version>4.4</httpcore-version>
+        <httpclient-version>4.5</httpclient-version>
+        <commons-logging-version>1.1.3</commons-logging-version>
+        <logback-classic-version>1.2.3</logback-classic-version>
+        <log4j-version>1.2.16</log4j-version>
+        <guava-version>20.0</guava-version>
+        <httpcomponents-version>4.5.6</httpcomponents-version>
+        <commons-collections4-version>4.1</commons-collections4-version>
+        <mapper.version>4.0.0</mapper.version>
+        <elasticsearch.version>7.4.2</elasticsearch.version>
+        <!-- 高版本JDK打包 -->
+        <lombok.version>1.18.30</lombok.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
+    </properties>
+
+    <dependencies>
+
+        <!-- Spring Boot Web依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- Spring Boot与Nacos整合的核心依赖 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2023.0.1.0</version> <!-- 与Spring Boot 3.2.x兼容 -->
+        </dependency>
+
+        <!-- 配置管理依赖,如果你需要配置管理功能 -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2023.0.1.0</version>
+        </dependency>
+
+        <!--提供了引导配置的支持,允许应用程序在启动时从外部配置中心(如 Nacos、Consul、Config Server 等)加载配置。-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-bootstrap</artifactId>
+            <version>4.1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.6</version>
+        </dependency>
+
+        <!--lombok-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${guava-version}</version>
+        </dependency>
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profile>dev</profile>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
 </project>

+ 0 - 19
webchat-api/.mvn/wrapper/maven-wrapper.properties

@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-wrapperVersion=3.3.2
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

+ 0 - 13
webchat-api/src/main/java/com/webchat/api/WebchatApiApplication.java

@@ -1,13 +0,0 @@
-package com.webchat.api;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class WebchatApiApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(WebchatApiApplication.class, args);
-    }
-
-}

+ 0 - 1
webchat-api/src/main/resources/application.properties

@@ -1 +0,0 @@
-spring.application.name=webchat-api

+ 7 - 0
webchat-common/pom.xml

@@ -20,4 +20,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.webchat</groupId>
+            <artifactId>webchat-domain</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>

+ 50 - 0
webchat-common/src/main/java/com/webchat/bean/APIPageResponseBean.java

@@ -0,0 +1,50 @@
+package com.webchat.bean;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class APIPageResponseBean<T> {
+
+    private Boolean success;
+
+    private Integer code;
+
+    private String msg;
+
+    private Long pageNo;
+
+    private Long pageSize;
+
+    private Long total;
+
+    private Long pageTotal;
+
+    private List<T> data;
+
+    public APIPageResponseBean() {
+
+    }
+
+    public APIPageResponseBean error() {
+        APIPageResponseBean responseBean = new APIPageResponseBean();
+        responseBean.success = false;
+        responseBean.code = 500;
+        responseBean.msg = "ERROR";
+        return responseBean;
+    }
+
+    public static APIPageResponseBean success(long pageNo, long pageSize, long total, List data) {
+        APIPageResponseBean responseBean = new APIPageResponseBean();
+        responseBean.success = true;
+        responseBean.code = 200;
+        responseBean.msg = "OK";
+        responseBean.pageNo = pageNo;
+        responseBean.pageSize = pageSize;
+        responseBean.data = data;
+        responseBean.total = total;
+        responseBean.pageTotal = total % pageSize == 0 ? total / pageSize : total / pageSize + 1;
+        return responseBean;
+    }
+}

+ 20 - 0
webchat-common/src/main/java/com/webchat/bean/APIResponseBean.java

@@ -0,0 +1,20 @@
+package com.webchat.bean;
+
+import lombok.Data;
+
+@Data
+public class APIResponseBean<T> {
+
+    private Boolean success;
+
+    private Integer code;
+
+    private String msg;
+
+    /***
+     * 耗时
+     */
+    private Long cost;
+
+    private T data;
+}

+ 49 - 0
webchat-common/src/main/java/com/webchat/bean/APIResponseBeanUtil.java

@@ -0,0 +1,49 @@
+package com.webchat.bean;
+
+
+import org.apache.commons.lang3.ObjectUtils;
+
+public class APIResponseBeanUtil {
+
+    /***
+     * 构建成功结果
+     * @param data
+     * @return
+     */
+    public static APIResponseBean success(Object data) {
+        APIResponseBean apiResponseBean = new APIResponseBean();
+        apiResponseBean.setSuccess(true);
+        apiResponseBean.setCode(200);
+        apiResponseBean.setMsg("OK");
+        apiResponseBean.setData(data);
+        return apiResponseBean;
+    }
+
+    public static APIResponseBean success() {
+        return success(null);
+    }
+
+    /***
+     * 构建失败结果
+     * @param code
+     * @param msg
+     * @return
+     */
+    public static APIResponseBean error(Integer code, String msg) {
+        APIResponseBean apiResponseBean = new APIResponseBean();
+        apiResponseBean.setSuccess(false);
+        apiResponseBean.setCode(code);
+        apiResponseBean.setMsg(msg);
+        return apiResponseBean;
+    }
+
+    /**
+     * 校验返回结果是否成功
+     *
+     * @param apiResponseBean
+     * @return
+     */
+    public static boolean isOk(APIResponseBean apiResponseBean) {
+        return apiResponseBean != null && ObjectUtils.equals(apiResponseBean.getSuccess(), true);
+    }
+}

BIN
webchat-common/target/classes/com/webchat/bean/APIPageResponseBean.class


BIN
webchat-common/target/classes/com/webchat/bean/APIResponseBean.class


BIN
webchat-common/target/classes/com/webchat/bean/APIResponseBeanUtil.class


+ 3 - 0
webchat-domain/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=webchat-domain
+groupId=com.webchat
+version=1.0-SNAPSHOT

+ 0 - 0
webchat-domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst


BIN
webchat-domain/target/webchat-domain-1.0-SNAPSHOT.jar


BIN
webchat-domain/target/webchat-domain-1.0-SNAPSHOT.jar.original


+ 0 - 42
webchat-eurake/pom.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>com.webchat</groupId>
-        <artifactId>webchat</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>com.webchat</groupId>
-    <artifactId>webchat-eurake</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>webchat-eurake</name>
-    <description>webchat-eurake</description>
-
-    <properties>
-        <java.version>17</java.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 20
webchat-eurake/src/main/java/com/webchat/webchateurake/WebchatEurakeApplication.java

@@ -1,20 +0,0 @@
-package com.webchat.webchateurake;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-@EnableEurekaServer
-public class WebchatEurakeApplication extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        SpringApplication.run(WebchatEurakeApplication.class, args);
-    }
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(WebchatEurakeApplication.class);
-    }
-}

+ 0 - 1
webchat-eurake/src/main/resources/application.properties

@@ -1 +0,0 @@
-spring.application.name=webchat-eurake

+ 62 - 0
webchat-pay/pom.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.webchat</groupId>
+        <artifactId>webchat</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>com.webchat</groupId>
+    <artifactId>webchat-pay</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>webchat-pay</name>
+    <description>webchat-pay</description>
+
+
+    <properties>
+
+    </properties>
+
+    <dependencies>
+        <!--引入mysql驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.46</version>
+        </dependency>
+        <!--使用JPA作为ORM框架 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!--使用JPA作为ORM框架 -->
+        <dependency>
+            <groupId>com.webchat</groupId>
+            <artifactId>webchat-remote</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+    </profiles>
+</project>

+ 15 - 0
webchat-pay/src/main/java/com/webchat/pay/WebchatPayApplication.java

@@ -0,0 +1,15 @@
+package com.webchat.pay;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+@SpringBootApplication
+@EnableDiscoveryClient
+public class WebchatPayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WebchatPayApplication.class, args);
+    }
+
+}

+ 20 - 0
webchat-pay/src/main/java/com/webchat/pay/controller/PayServiceController.java

@@ -0,0 +1,20 @@
+package com.webchat.pay.controller;
+
+
+import com.webchat.bean.APIResponseBean;
+import com.webchat.bean.APIResponseBeanUtil;
+import com.webchat.rmi.pay.PayServiceClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+
+@RestController
+public class PayServiceController implements PayServiceClient {
+
+
+    @Override
+    public APIResponseBean<BigDecimal> getBalance(@PathVariable String userId) {
+        return APIResponseBeanUtil.success(new BigDecimal("10"));
+    }
+}

+ 23 - 0
webchat-pay/src/main/resources/application.yml

@@ -0,0 +1,23 @@
+server:
+  port: 8102
+spring:
+  profiles:
+    active: @profile@
+  application:
+    name: webchat-pay-service
+  cloud:
+    #---------------------------------nacos注册中心----------------------------------#
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+      #---------------------------------nacos配置中心--------------------------------#
+      config:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+        group: DEFAULT_GROUP
+        file-extension: yaml
+  #---------------------------------配置中心,配置文件变化监听配置-----------------------#
+  config:
+    import:
+      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?refreshEnabled=true

+ 2 - 2
webchat-eurake/src/test/java/com/webchat/webchateurake/WebchatEurakeApplicationTests.java → webchat-pay/src/test/java/com/webchat/pgc/WebchatPgcApplicationTests.java

@@ -1,10 +1,10 @@
-package com.webchat.webchateurake;
+package com.webchat.connect;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class WebchatEurakeApplicationTests {
+class WebchatPgcApplicationTests {
 
     @Test
     void contextLoads() {

+ 23 - 0
webchat-pay/target/classes/application.yml

@@ -0,0 +1,23 @@
+server:
+  port: 8102
+spring:
+  profiles:
+    active: dev
+  application:
+    name: webchat-pay-service
+  cloud:
+    #---------------------------------nacos注册中心----------------------------------#
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+      #---------------------------------nacos配置中心--------------------------------#
+      config:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+        group: DEFAULT_GROUP
+        file-extension: yaml
+  #---------------------------------配置中心,配置文件变化监听配置-----------------------#
+  config:
+    import:
+      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?refreshEnabled=true

BIN
webchat-pay/target/classes/com/webchat/pay/WebchatPayApplication.class


BIN
webchat-pay/target/classes/com/webchat/pay/controller/PayServiceController.class


+ 0 - 13
webchat-pgc/pom.xml

@@ -39,19 +39,7 @@
             <artifactId>webchat-remote</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -60,5 +48,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

+ 2 - 0
webchat-pgc/src/main/java/com/webchat/pgc/WebchatPGCApplication.java

@@ -2,8 +2,10 @@ package com.webchat.pgc;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
+@EnableDiscoveryClient
 public class WebchatPGCApplication {
 
     public static void main(String[] args) {

+ 0 - 1
webchat-pgc/src/main/resources/application.properties

@@ -1 +0,0 @@
-spring.application.name=webchat-pgc

+ 23 - 0
webchat-pgc/src/main/resources/application.yml

@@ -0,0 +1,23 @@
+server:
+  port: 8102
+spring:
+  profiles:
+    active: @profile@
+  application:
+    name: webchat-pgc-service
+  cloud:
+    #---------------------------------nacos????----------------------------------#
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+      #---------------------------------nacos????--------------------------------#
+      config:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+        group: DEFAULT_GROUP
+        file-extension: yaml
+  #---------------------------------???????????????-----------------------#
+  config:
+    import:
+      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?refreshEnabled=true

+ 23 - 0
webchat-pgc/target/classes/application.yml

@@ -0,0 +1,23 @@
+server:
+  port: 8102
+spring:
+  profiles:
+    active: dev
+  application:
+    name: webchat-pgc-service
+  cloud:
+    #---------------------------------nacos????----------------------------------#
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+      #---------------------------------nacos????--------------------------------#
+      config:
+        server-addr: 127.0.0.1:8848
+        namespace: 2cdfb8e3-f127-4020-93df-2d4c3dc805b5
+        group: DEFAULT_GROUP
+        file-extension: yaml
+  #---------------------------------???????????????-----------------------#
+  config:
+    import:
+      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?refreshEnabled=true

BIN
webchat-pgc/target/classes/com/webchat/pgc/WebchatPGCApplication.class


+ 9 - 1
webchat-remote/pom.xml

@@ -24,9 +24,17 @@
     <dependencies>
         <dependency>
             <groupId>com.webchat</groupId>
-            <artifactId>webchat-domain</artifactId>
+            <artifactId>webchat-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

+ 17 - 0
webchat-remote/src/main/java/com/webchat/rmi/pay/PayServiceClient.java

@@ -0,0 +1,17 @@
+package com.webchat.rmi.pay;
+
+import com.webchat.bean.APIResponseBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.math.BigDecimal;
+
+@FeignClient(name = "webchat-pay-service")
+public interface PayServiceClient {
+
+
+    @GetMapping("/pay/wallet/balance/{userId}")
+    APIResponseBean<BigDecimal> getBalance(@PathVariable String userId);
+
+}

BIN
webchat-remote/target/classes/com/webchat/rmi/pay/PayServiceClient.class


+ 19 - 4
webchat-api/pom.xml → webchat-search/pom.xml

@@ -9,17 +9,32 @@
     </parent>
 
     <groupId>com.webchat</groupId>
-    <artifactId>webchat-api</artifactId>
+    <artifactId>webchat-search</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>webchat-api</name>
-    <description>webchat-api</description>
+    <name>webchat-search</name>
+    <description>webchat-search</description>
+
 
     <properties>
-        <java.version>17</java.version>
+
     </properties>
+
     <dependencies>
+
+        <!--引入mysql驱动-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>5.1.46</version>
+        </dependency>
+        <!--使用JPA作为ORM框架 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

+ 13 - 0
webchat-search/src/main/java/com/webchat/pay/WebchatSearchApplication.java

@@ -0,0 +1,13 @@
+package com.webchat.pay;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+
+@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class})
+public class WebchatSearchApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(WebchatSearchApplication.class, args);
+    }
+}

+ 0 - 0
webchat-user/target/classes/application.properties → webchat-search/src/main/resources/application.properties


+ 13 - 0
webchat-search/src/test/java/com/webchat/pgc/WebchatPgcApplicationTests.java

@@ -0,0 +1,13 @@
+package com.webchat.connect;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class WebchatPgcApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}

+ 1 - 0
webchat-search/target/classes/application.properties

@@ -0,0 +1 @@
+spring.application.name=webchat-user

BIN
webchat-search/target/classes/com/webchat/pay/WebchatSearchApplication.class


+ 1 - 0
webchat-sso/target/classes/application.properties

@@ -0,0 +1 @@
+spring.application.name=webchat-sso

BIN
webchat-sso/target/classes/com/webchat/web/WebchatSSOApplication.class


+ 3 - 0
webchat-sso/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=webchat-sso
+groupId=com.webchat
+version=0.0.1-SNAPSHOT

+ 1 - 0
webchat-sso/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1 @@
+com/webchat/web/WebchatSSOApplication.class

+ 1 - 0
webchat-sso/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1 @@
+/Users/wangqi49/Desktop/webchat-springcloud/webchat-sso/src/main/java/com/webchat/web/WebchatSSOApplication.java

BIN
webchat-sso/target/webchat-sso-0.0.1-SNAPSHOT.jar


BIN
webchat-sso/target/webchat-sso-0.0.1-SNAPSHOT.jar.original


+ 1 - 1
webchat-user/src/main/java/com/webchat/user/WebchatUserApplication.java → webchat-user/src/main/java/com/webchat/pay/WebchatUserApplication.java

@@ -1,4 +1,4 @@
-package com.webchat.user;
+package com.webchat.pay;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

BIN
webchat-user/target/classes/com/webchat/user/WebchatUserApplication.class