nacos : xxl-job commit

tofly-auth/pom.xml

@@ -3,14 +3,15 @@
          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">
     <parent>
-        <artifactId>fframwork</artifactId>
+        <artifactId>tofly-parent</artifactId>
         <groupId>com.tofly</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>tofly-auth</artifactId>
     <packaging>jar</packaging>
+    <version>1.0.0</version>
 
     <dependencies>
         <!--配置中心客户端-->
@@ -29,18 +30,6 @@
             <artifactId>common-log</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <!--web 模块-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <!--排除tomcat依赖-->
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!--undertow容器-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -71,65 +60,5 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.oracle</groupId>-->
-            <!--<artifactId>ojdbc6</artifactId>-->
-            <!--<version>11.2.0.4.0-atlassian-hosted</version>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>mysql</groupId>-->
-            <!--<artifactId>mysql-connector-java</artifactId>-->
-        <!--</dependency>-->
-
-       <!-- <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc14</artifactId>
-            <version>10.2.0.5.0</version>
-        </dependency>-->
-
     </dependencies>
-
-    <!--<build>-->
-        <!--<plugins>-->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.maven.plugins</groupId>-->
-                <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<source>1.8</source>-->
-                    <!--<target>1.8</target>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-            <!--<plugin>-->
-                <!--<groupId>org.springframework.boot</groupId>-->
-                <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
-                <!--<configuration>-->
-                    <!--<includeSystemScope>true</includeSystemScope>-->
-                <!--</configuration>-->
-            <!--</plugin>-->
-        <!--</plugins>-->
-    <!--</build>-->
-
-    <build>
-        <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>

tofly-auth/src/main/resources/bootstrap.yml

@@ -1,49 +1,16 @@
-server:
-  port: 8999
-
-
-#注册到注册中心
-eureka:
-  instance:
-    prefer-ip-address: true
-  client:
-    service-url:
-      defaultZone: http://tofly-eureka:${EUREKAPORT:9999}/eureka/
 spring:
-  application:
-    name: tofly-auth
-    # 配置中心
   cloud:
-    config:
-      fail-fast: true
-      name: ${spring.application.name}
-      profile: ${spring.profiles.active}
-      discovery:
-        enabled: true
-        service-id: tofly-config
-    gateway:
+    nacos:
+      config:
+        # nacos指定空间
+        namespace: 3038570d-109a-41aa-9e64-84a53dd01b3a
+        # nacos部署IP
+        server-addr: 192.168.2.203:8848
+        # 配置后缀
+        file-extension: yaml
       discovery:
-        locator:
-          enabled: true
-  profiles:
-    active: dev
-  main:
-    allow-bean-definition-overriding: true
-
-tofly-filter:
-  urls:
-    - /token/**
-    - /v2/api-docs
-    - /actuator/**
-
-tofly-base:
-  ribbon:
-    NFLoadBalancerRuleClassName: com.tofly.auth.balance.ToflyChooseBalancerRule
-
-
-api:
-  doc:
-    title: 安全认证接口    #API文档标题
-    description: 登录、退出、以及登录验证应用           #API文档说明
-    author: wangjian               #作者
-    version: 1.0                  #版本号
+        namespace: 3038570d-109a-41aa-9e64-84a53dd01b3a
+        server-addr: 192.168.2.203:8848
+  application:
+    # 该应用在nacos配置中的名称
+    name: tofly-auth

xxl-job/xxl-job-admin/src/main/resources/bootstrap.yml

@@ -6,8 +6,6 @@ spring:
         namespace: e691c906-5aab-485e-a99a-a8f65f4b0ae2
         # nacos部署IP
         server-addr: 192.168.2.203:8848
-        # 配置后缀
-        file-extension: yaml
   application:
     # 该应用在nacos配置中的名称
     name: xxl-job-admin