update

cooleshow-auth/auth-server/pom.xml

@@ -58,7 +58,7 @@
 			<groupId>com.yonge.cooleshow</groupId>
 			<artifactId>auth-api</artifactId>
 		</dependency>
-
+        <!--
 		<dependency>
 			<groupId>com.yonge.toolset</groupId>
 			<artifactId>audit-log</artifactId>
@@ -68,7 +68,7 @@
 					<groupId>org.freemarker</groupId>
 				</exclusion>
 			</exclusions>
-		</dependency>
+		</dependency>-->
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/AuthServerApplication.java

@@ -16,7 +16,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients({"com.yonge.cooleshow"})
+@EnableFeignClients
 @MapperScan("com.yonge.cooleshow.auth.dal.dao")
 @ComponentScan(basePackages={"com.yonge.cooleshow", "com.yonge.toolset.log"})
 @Configuration

cooleshow-auth/auth-server/src/main/resources/application-dev.yml

@@ -0,0 +1,69 @@
+server:
+  port: 8088
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+      uri-encoding: UTF-8
+
+spring:
+  application:
+    name: auth-server
+
+  datasource:
+    #url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://localhost:3306/cooleshow_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: 123456
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+  #单节点redis
+  redis:
+    host: localhost
+    port: 6379
+    database: 0
+    password:
+    #timeout: 10000m
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya
+
+
+message:
+  debugMode: true

cooleshow-auth/auth-server/src/main/resources/application-prod.yml

@@ -0,0 +1,54 @@
+server:
+  port: 9090
+  #address: 127.0.0.1
+  #sessionTimeout: 30
+  servlet:
+    context-path: /cooleshow
+  tomcat:
+    uri-encoding: UTF-8
+
+spring:
+  datasource:
+    url: jdbc:mysql://47.114.1.200:3306/mec_dev?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: dayaDataOnline@2019
+    driver-class-name: com.mysql.jdbc.Driver
+    debug: false
+    #Druid#
+    name: test
+    #type: com.alibaba.druid.pool.DruidDataSource
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+
+
+mybatis:
+  typeAliasesPackage: com.yonge.cooleshow.biz.dal.entity
+  mapperLocations: classpath:config/mybatis/*.xml
+  #config-location: classpath:mybatis/mybatis-config.xml
+
+
+# e签宝电子签名
+eseal:
+  tsign:
+    projectid: 4438776254
+    projectSecret: a94cf63d6361084d232f345d71321691
+    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
+
+# 金山云OSS存储
+storage:
+  sso:
+    accessKeyID: AKLTtTeIbadpRG-pil4S0Q4m-Q
+    accessKeySecret: OB1HmNOfDNW95wHoxMkP6IPFZXormk2ngA800TkvKAw7ozhiJGRqrMnnV8ZrAU3WRQ==
+    endpoint: ks3-cn-beijing.ksyun.com
+    bucketName: daya

cooleshow-auth/auth-server/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.properties

@@ -1,16 +0,0 @@
-#\u6307\u5b9a\u5f00\u53d1\u73af\u5883
-#spring.profiles.active=dev
-#\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.1.200:8848
-#\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=6f8374a9-598f-4889-bb17-476070ffb8de
-#\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-#\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=auth
-#\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
-spring.cloud.nacos.config.file-extension=yaml
-#\u662f\u5426\u52a8\u6001\u5237\u65b0
-spring.cloud.nacos.config.refresh.enabled=true
-#\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
-spring.cloud.nacos.config.enabled=true

cooleshow-auth/auth-server/src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,28 @@
+#spring:
+#  cloud:
+#    nacos:
+#      config:
+#        server-addr: 47.114.1.200:8848
+#        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+#        group: DEFAULT_GROUP
+#        prefix: student
+#        file-extension: yaml
+#        refresh:
+#          enabled: true
+#        enabled: true
+
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: localhost:8848
+        namespace: dev
+#      config:
+#        server-addr: localhost:8848
+#        namespace: dev
+#        group: DEFAULT_GROUP
+#        #prefix: admin
+#        file-extension: yaml
+#        refresh:
+#          enabled: true
+#        enabled: true

cooleshow-auth/auth-server/src/main/resources/bootstrap-prod.yml

@@ -0,0 +1,12 @@
+spring:
+  cloud:
+    nacos:
+      config:
+        server-addr: 47.114.1.200:8848
+        namespace: 6f8374a9-598f-4889-bb17-476070ffb8de
+        group: DEFAULT_GROUP
+        prefix: student
+        file-extension: yaml
+        refresh:
+          enabled: true
+        enabled: true

cooleshow-auth/auth-server/src/main/resources/logback-spring.xml

@@ -27,8 +27,8 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="WARN" />
-	<root level="WARN">
+	<logger name="com.yonge" level="INFO" />
+	<root level="INFO">
 		<appender-ref ref="stdout" />
 		<appender-ref ref="file" />
 	</root>