Skip to content

L
loginservice
Commit ee07c24c by mahx
Options

k8s modify

parent 5ea0a6dc
Showing with 230 additions and 28 deletions
Dockerfile 0 → 100644
FROM openjdk:11-jdk-oracle
ENV APP_NAME sso
ENV APP_PORT 8764
VOLUME /tmp
ENV USER_NAME iapdg${APP_NAME}
ENV WORKING_DIR /home/${USER_NAME}
USER root
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone && /usr/sbin/useradd ${USER_NAME} && mkdir -p ${WORKING_DIR}
ADD ./target/${APP_NAME}-dist.tar.gz $WORKING_DIR/
RUN cd $WORKING_DIR && chown -R ${USER_NAME}:${USER_NAME} ${WORKING_DIR} && mkdir -p /data/logs/${USER_NAME}/ && chown -R ${USER_NAME}:${USER_NAME} /data/logs/${USER_NAME}
USER ${USER_NAME}
EXPOSE ${APP_PORT}
ENTRYPOINT ["/bin/bash", "-c", "${WORKING_DIR}/${APP_NAME}/bin/startup.sh"]
pom.xml
...@@ -18,10 +18,16 @@ ...@@ -18,10 +18,16 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <!--<java.version>1.8</java.version>-->
<spring-cloud.version>Finchley.RELEASE</spring-cloud.version> <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
</properties> </properties>
<repositories>
<repository>
<id>keymobile</id>
<name>keymobile</name>
<url>http://139.198.127.28:18081/repository/maven-public/</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.ulisesbocchio</groupId> <groupId>com.github.ulisesbocchio</groupId>
...@@ -106,7 +112,7 @@ ...@@ -106,7 +112,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.6</version> <version>8.0.21</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
...@@ -139,6 +145,27 @@ ...@@ -139,6 +145,27 @@
<artifactId>config</artifactId> <artifactId>config</artifactId>
<version>1.1.2-release</version> <version>1.1.2-release</version>
</dependency> </dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
...@@ -190,6 +217,23 @@ ...@@ -190,6 +217,23 @@
</jvmArguments> </jvmArguments>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/server-dist.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>create-assemblies</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
src/assembly/server-dist.xml 0 → 100644
<assembly>
<id>dist</id>
<formats>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>src/kits</directory>
<outputDirectory>${file.separator}bin</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>src/kits</directory>
<outputDirectory>${file.separator}config</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>${user.dir}/target</directory>
<outputDirectory>${file.separator}</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<fileMode>755</fileMode>
</fileSet>
<fileSet>
<directory>resources</directory>
<outputDirectory>resources</outputDirectory>
<includes>
<include>**/*</include>
</includes>
<fileMode>755</fileMode>
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
src/kits/logback-custom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<springProperty name="spring.redis.host" source="spring.redis.host"/>
<springProperty name="spring.redis.port" source="spring.redis.port"/>
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder charset="UTF-8">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="fileout" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>/data/logs/iapdgsso/sso.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<maxHistory>30</maxHistory>
<fileNamePattern>/data/logs/iapdgsso/sso.log.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>5MB</maxFileSize>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder charset="UTF-8">
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %X{user} %X{session} %-5level %logger{5} - %msg%n</pattern>
</encoder>
</appender>
<appender name="logstash" class="com.cwbase.logback.RedisAppender">
<host>${spring.redis.host}</host>
<port>${spring.redis.port}</port>
<password>${spring.redis.password}</password>
<key>logstash</key>
<additionalField>
<key>user</key>
<value>@{user}</value>
</additionalField>
<additionalField>
<key>session</key>
<value>@{session}</value>
</additionalField>
</appender>
<logger name="sso.API">
<appender-ref ref="logstash"/>
</logger>
<root level="INFO">
<appender-ref ref="stdout"/>
</root>
</configuration>
\ No newline at end of file
src/kits/startup.sh 0 → 100644
#!/bin/bash
TEMP_DIR="-Djava.io.tmpdir=/tmp"
APP_NAME="sso"
OS_USER_NAME="iapdg$APP_NAME"
BASE_LOC="/home/$OS_USER_NAME/$APP_NAME"
JAR_NAME="$APP_NAME.jar"
JAR_LOC=${BASE_LOC}/${JAR_NAME}
PROFILE="prod"
CONFIG_URL="http://SMS-KFSJGK-S02:8082"
#JVM_OPTS="-Xmx512M -Xms512M"
JAVA_OPTS="-server $JVM_OPTS -XX:+UseCompressedOops -XX:+UseG1GC"
#SPRING_OPTS="--spring.cloud.config.uri=$CONFIG_URL --spring.profiles.active=$PROFILE --logging.config=$BASE_LOC/config/logback-custom.xml"
SPRING_OPTS="--spring.config.location=$BASE_LOC/config/yml/application.yml --spring.profiles.active=$PROFILE --logging.config=$BASE_LOC/config/logback-custom.xml"
CURR_DIR=`pwd`
cd $BASE_LOC
#nohup java $JAVA_OPTS $TEMP_DIR -jar $JAR_LOC $SPRING_OPTS > $BASE_LOC/console.log 2>&1 &
java $JAVA_OPTS $TEMP_DIR -jar $JAR_LOC $SPRING_OPTS
echo "$JAR_NAME started."
cd $CURR_DIR
src/main/resources/application-local.yml
server: server:
port: 8764 port: 8764
eureka:
client:
registerWithEureka: true
region: default
registryFetchIntervalSeconds: 5
serviceUrl:
defaultZone: http://192.168.0.111:8081/eureka/
instance:
prefer-ip-address: false
hostname: 192.168.0.143
spring: spring:
application:
name: auth
session: session:
store-type: redis store-type: redis
redis: redis:
namespace: dataplatformdev namespace: test
redis: redis:
host: 192.168.0.192 host: 139.198.127.54
port: 6379 port: 18072
password: dataSharing
datasource: datasource:
driver-class-name: com.mysql.jdbc.Driver url: jdbc:mysql://139.198.127.54:18073/test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
url: jdbc:mysql://192.168.0.192:3306/cgn2_dev?autoReconnect=true
username: test username: test
password: test password: Km@38497130
driver-class-name: com.mysql.cj.jdbc.Driver
servlet:
multipart:
max-file-size: 100Mb
max-request-size: 100Mb
security: eureka:
authUser: root client:
authPwd: pwd registerWithEureka: false
permit: false region: default
allowRootLogin: true registryFetchIntervalSeconds: 5
serviceUrl:
defaultZone: http://localhost:8081/eureka/
enabled: false
logging: redirect-url:
config: classpath:logback-custom.xml system-management: http://localhost:8764/swagger-ui.html
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment