Merge branch 'dev-web-config' into dev

.gitignore

@@ -1,98 +1,49 @@
-# ---> Java
+######################################################################
-# Compiled class file
+# Build Tools
-*.class
+
-# Log file
+.gradle
-*.log
+/build/
-# BlueJ files
+!gradle/wrapper/gradle-wrapper.jar
-*.ctxt
+
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
-# ---> Maven
 target/
-pom.xml.tag
+!.mvn/wrapper/maven-wrapper.jar
-pom.xml.releaseBackup
+
-pom.xml.versionsBackup
+######################################################################
-pom.xml.next
+# IDE
-release.properties
+
-dependency-reduced-pom.xml
+### STS ###
-buildNumber.properties
+.apt_generated
-.mvn/timing.properties
-# https://github.com/takari/maven-wrapper#usage-without-binary-jar
-.mvn/wrapper/maven-wrapper.jar
-# Eclipse m2e generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
 .classpath
-# ---> JetBrains
+.factorypath
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+.project
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+.settings
-# User-specific stuff
+.springBeans
-.idea/**/workspace.xml
+
-.idea/**/tasks.xml
+### IntelliJ IDEA ###
-.idea/**/usage.statistics.xml
+.idea
-.idea/**/dictionaries
-.idea/**/shelf
-# AWS User-specific
-.idea/**/aws.xml
-# Generated files
-.idea/**/contentModel.xml
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-# CMake
-cmake-build-*/
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-# File-based project format
 *.iws
-# IntelliJ
+*.iml
-out/
+*.ipr
-# mpeltonen/sbt-idea plugin
+
-.idea_modules/
+### JRebel ###
-# JIRA plugin
+rebel.xml
-atlassian-ide-plugin.xml
+### NetBeans ###
-# Cursive Clojure plugin
+nbproject/private/
-.idea/replstate.xml
+build/*
-# SonarLint plugin
+nbbuild/
-.idea/sonarlint/
+dist/
-# Crashlytics plugin (for Android Studio and IntelliJ)
+nbdist/
-com_crashlytics_export_strings.xml
+.nb-gradle/
-crashlytics.properties
+
-crashlytics-build.properties
+######################################################################
-fabric.properties
+# Others
-# Editor-based Rest Client
+*.log
-.idea/httpRequests
+*.xml.versionsBackup
-# Android studio 3.1+ serialized cache file
+*.swp
-.idea/caches/build_file_checksums.ser
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+
+docker/*.jar
+/.idea/

.idea/compiler.xml

@@ -11,9 +11,9 @@
         <module name="ds-miniapps-api" />
         <module name="ds-mybatisplus-config" />
         <module name="ds-basemodel" />
+        <module name="ds-miniapps-service" />
         <module name="ds-web-config" />
         <module name="ds-miniapps-model" />
-        <module name="ds-miniapps-biz" />
         <module name="ds-gateway" />
         <module name="ds-mybatisplus-support" />
         <module name="ds-timer-task" />
@@ -25,16 +25,16 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="dashan-cloud" options="" />
+      <module name="dashan-cloud" options="-parameters" />
       <module name="ds-basemodel" options="-parameters" />
-      <module name="ds-biz" options="" />
+      <module name="ds-commons" options="-parameters" />
-      <module name="ds-commons" options="" />
+      <module name="ds-config" options="-parameters" />
-      <module name="ds-config" options="" />
       <module name="ds-gateway" options="-parameters" />
-      <module name="ds-miniapps" options="" />
+      <module name="ds-miniapps" options="-parameters" />
       <module name="ds-miniapps-api" options="-parameters" />
-      <module name="ds-miniapps-biz" options="-parameters" />
       <module name="ds-miniapps-model" options="-parameters" />
+      <module name="ds-miniapps-service" options="-parameters" />
+      <module name="ds-modules" options="-parameters" />
       <module name="ds-mybatisplus-config" options="-parameters" />
       <module name="ds-mybatisplus-support" options="-parameters" />
       <module name="ds-timer-task" options="-parameters" />

.idea/encodings.xml

@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/ds-biz/ds-miniapps/ds-miniapps-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/ds-miniapps/ds-miniapps-biz/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/ds-miniapps/ds-miniapps-model/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/ds-miniapps/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/ds-miniapps/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/ds-biz/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-commons/ds-basemodel/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-commons/ds-config/ds-mybatisplus-config/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-commons/ds-config/ds-mybatisplus-support/src/main/java" charset="UTF-8" />
@@ -19,6 +12,14 @@
     <file url="file://$PROJECT_DIR$/ds-commons/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-gateway/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-gateway/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/ds-miniapps-api/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/ds-miniapps-biz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/ds-miniapps-model/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/ds-miniapps-service/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/ds-miniapps/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-modules/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-timer-task/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />

.idea/misc.xml

@@ -5,6 +5,7 @@
     <option name="originalFiles">
       <list>
         <option value="$PROJECT_DIR$/pom.xml" />
+        <option value="$PROJECT_DIR$/ds-module/pom.xml" />
       </list>
     </option>
   </component>

README.md

@@ -0,0 +1,4 @@
+# BUILD
+- 跳过测试进行打包
+  
+  ```mvn clean compile package -Dmaven.test.skip=true -Pdev```

docker/copy.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# 复制项目的文件到对应docker路径，便于一键生成镜像。
+usage() {
+	echo "Usage: sh copy.sh"
+	exit 1
+}
+
+
+# copy jar
+echo "begin copy ds-gateway "
+cp ../ds-gateway/target/ds-gateway.jar ./ds/gateway/jar
+
+echo "begin copy ds-miniapps "
+cp ../ds-modules/ds-miniapps/ds-miniapps-service/target/ds-miniapps-service.jar ./ds/modules/miniapps/jar
+
+

docker/ds/gateway/Dockerfile

@@ -0,0 +1 @@
+FROM openjdk:17

docker/ds/gateway/jar/readme.txt

@@ -0,0 +1 @@
+存放jar包

docker/ds/modules/miniapps/jar/readme.txt

@@ -0,0 +1 @@
+存放jar包

ds-gateway/pom.xml

@@ -13,13 +13,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-gateway</artifactId>-->
-<!--        </dependency>-->
         <!--注册中心客户端-->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -30,5 +26,25 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-loadbalancer</artifactId>
+        </dependency>
     </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

ds-gateway/src/main/java/com/ds/gateway/GateWayApplication.java

@@ -14,6 +14,7 @@ public class GateWayApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(GateWayApplication.class, args);
+
     }
 }
 

ds-gateway/src/main/java/com/ds/gateway/TestController.java

@@ -1,21 +0,0 @@
-package com.ds.gateway;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author ds
- * @since 2023/8/8
- */
-@RestController
-public class TestController {
-
-    @Value("${testconfig}")
-    private String test;
-
-    @GetMapping("/test")
-    public String test(){
-        return test;
-    }
-}

ds-gateway/src/main/resources/application.yml

@@ -13,6 +13,15 @@ spring:
       config:
         file-extension: yml
         namespace: @nacosNamespace@
+    gateway:
+      routes:
+        - id: mini_apps #路由的唯一标识，路由到order
+          uri: lb://ds-mini-apps #需要转发的地址
+          #断言规则
+          predicates:
+            - Path=/mini-apps/**
+          filters:
+            - StripPrefix=1 #转发之前去掉第一层路径
   config:
     import:
       - optional:nacos:${spring.application.name}.${spring.cloud.nacos.config.file-extension}

ds-modules/ds-miniapps/ds-miniapps-service/pom.xml

@@ -9,7 +9,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>ds-miniapps-biz</artifactId>
+    <artifactId>ds-miniapps-service</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -52,5 +52,20 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

ds-modules/ds-miniapps/ds-miniapps-service/src/test/java/com/ds/miniapps/biz/dummyinfo/DummyInfoServiceTest.java

@@ -20,12 +20,12 @@ class DummyInfoServiceTest {
     @Autowired
     private DummyInfoService dummyInfoService;
 
-    @Test
+//    @Test
     void randDummyInfo(){
         List<DummyInfo> dummyInfos = dummyInfoService.randCreateDummyInfo(1000);
 
         // 写法2
-        String fileName = "C:\\Users\\21113\\Desktop\\doc\\simpleWrite" + System.currentTimeMillis() + ".xlsx";
+        String fileName = "D:\\Users\\21113\\Desktop\\doc\\simpleWrite" + System.currentTimeMillis() + ".xlsx";
         // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
         // 如果这里想使用03 则 传入excelType参数即可
         EasyExcel.write(fileName, DummyInfo.class).sheet("模板").doWrite(dummyInfos);

ds-modules/ds-miniapps/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ds</groupId>
-        <artifactId>ds-biz</artifactId>
+        <artifactId>ds-modules</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -14,7 +14,7 @@
     <modules>
         <module>ds-miniapps-api</module>
         <module>ds-miniapps-model</module>
-        <module>ds-miniapps-biz</module>
+        <module>ds-miniapps-service</module>
     </modules>
 
     <properties>

ds-modules/pom.xml

@@ -9,7 +9,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>ds-biz</artifactId>
+    <artifactId>ds-modules</artifactId>
     <packaging>pom</packaging>
     <modules>
         <module>ds-miniapps</module>

pom.xml

@@ -17,15 +17,15 @@
         <module>ds-gateway</module>
         <module>ds-timer-task</module>
         <module>ds-commons</module>
-        <module>ds-biz</module>
+        <module>ds-modules</module>
     </modules>
     <properties>
         <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <spring.boot.version>3.1.0</spring.boot.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
-        <spring.cloud.version>2022.0.2</spring.cloud.version>
+        <spring-cloud.version>2022.0.2</spring-cloud.version>
-        <spring.cloud.alibaba.version>2022.0.0.0-RC2</spring.cloud.alibaba.version>
+        <spring-cloud-alibaba.version>2022.0.0.0-RC2</spring-cloud-alibaba.version>
         <springdoc.version>2.1.0</springdoc.version>
         <knife4j.version>4.3.0</knife4j.version>
         <mysql.version>8.0.24</mysql.version>
@@ -38,21 +38,21 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring.boot.version}</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring.cloud.version}</version>
+                <version>${spring-cloud.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>com.alibaba.cloud</groupId>
                 <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring.cloud.alibaba.version}</version>
+                <version>${spring-cloud-alibaba.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -103,13 +103,33 @@
         </resources>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
             </plugin>
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>repackage</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
-
     <!--配置测试开发生产环境-->
     <profiles>
         <profile>