提交 19fc5332 编写于 作者: ibizdev's avatar ibizdev

zhouweidong 部署微服务接口 [ibiz-uaa,micorservice]

上级 bef7d685
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
git clone -b master $para2 ibzuaa/ git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/ cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<!--输出实体[SYS_AUTHLOG]数据结构 --> <!--输出实体[SYS_AUTHLOG]数据结构 -->
<changeSet author="root" id="tab-sys_authlog-6-1"> <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-6-1">
<createTable tableName="IBZAUTHLOG"> <createTable tableName="IBZAUTHLOG">
<column name="LOGID" remarks="" type="VARCHAR(100)"> <column name="LOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!--输出实体[SYS_OPEN_ACCESS]数据结构 --> <!--输出实体[SYS_OPEN_ACCESS]数据结构 -->
<changeSet author="root" id="tab-sys_open_access-37-2"> <changeSet author="a_A_5d9d78509" id="tab-sys_open_access-37-2">
<createTable tableName="IBZOPENACCESS"> <createTable tableName="IBZOPENACCESS">
<column name="ACCESSID" remarks="" type="VARCHAR(100)"> <column name="ACCESSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_OPEN_ACCESS_ACCESSID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_OPEN_ACCESS_ACCESSID"/>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<!--输出实体[SYS_PSSYSTEM]数据结构 --> <!--输出实体[SYS_PSSYSTEM]数据结构 -->
<changeSet author="root" id="tab-sys_pssystem-1-3"> <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-1-3">
<createTable tableName="IBZPSSYSTEM"> <createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)"> <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!--输出实体[SYS_PERMISSION]数据结构 --> <!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="root" id="tab-sys_permission-9-4"> <changeSet author="a_A_5d9d78509" id="tab-sys_permission-9-4">
<createTable tableName="IBZPERMISSION"> <createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)"> <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<!--输出实体[SYS_ROLE]数据结构 --> <!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="root" id="tab-sys_role-50-5"> <changeSet author="a_A_5d9d78509" id="tab-sys_role-50-5">
<createTable tableName="IBZROLE"> <createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)"> <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 --> <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="root" id="tab-sys_role_permission-25-6"> <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-25-6">
<createTable tableName="IBZROLE_PERMISSION"> <createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)"> <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<!--输出实体[SYS_USER_AUTH]数据结构 --> <!--输出实体[SYS_USER_AUTH]数据结构 -->
<changeSet author="root" id="tab-sys_user_auth-25-7"> <changeSet author="a_A_5d9d78509" id="tab-sys_user_auth-25-7">
<createTable tableName="IBZUSERAUTH"> <createTable tableName="IBZUSERAUTH">
<column name="AUTHID" remarks="" type="VARCHAR(100)"> <column name="AUTHID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_AUTH_AUTHID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_AUTH_AUTHID"/>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<!--输出实体[SYS_USER_ROLE]数据结构 --> <!--输出实体[SYS_USER_ROLE]数据结构 -->
<changeSet author="root" id="tab-sys_user_role-15-8"> <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-15-8">
<createTable tableName="IBZUSER_ROLE"> <createTable tableName="IBZUSER_ROLE">
<column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)"> <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
...@@ -189,13 +189,13 @@ ...@@ -189,13 +189,13 @@
<!--输出实体[SYS_PSSYSTEM]外键关系 --> <!--输出实体[SYS_PSSYSTEM]外键关系 -->
<!--输出实体[SYS_PERMISSION]外键关系 --> <!--输出实体[SYS_PERMISSION]外键关系 -->
<!--输出实体[SYS_ROLE]外键关系 --> <!--输出实体[SYS_ROLE]外键关系 -->
<changeSet author="root" id="fk-sys_role-50-9"> <changeSet author="a_A_5d9d78509" id="fk-sys_role-50-9">
<addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/> <addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 --> <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<!--输出实体[SYS_USER_AUTH]外键关系 --> <!--输出实体[SYS_USER_AUTH]外键关系 -->
<!--输出实体[SYS_USER_ROLE]外键关系 --> <!--输出实体[SYS_USER_ROLE]外键关系 -->
<changeSet author="root" id="fk-sys_user_role-15-10"> <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-15-10">
<addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/> <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
</changeSet> </changeSet>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
EXPOSE 8081 EXPOSE 40002
ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
...@@ -22,7 +22,36 @@ spec: ...@@ -22,7 +22,36 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8081 - containerPort: 40002
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.180.237"
- name: SERVER_PORT
value: "40002"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.100.243:8848"
- name: SPRING_REDIS_HOST
value: "172.16.100.243"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_A_5d9d78509"
- name: SPRING_DATASOURCE_PASSWORD
value: "@6dEfb3@"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_A_5d9d78509"
- name: IBIZ_OAUTH2_ENABLE
value: "true"
- name: NACOS
value: "172.16.100.243:8848"
- name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value: "ibizdev"
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /app/file mountPath: /app/file
...@@ -42,9 +71,9 @@ spec: ...@@ -42,9 +71,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 8081 port: 40002
targetPort: 8081 targetPort: 40002
nodePort: 8081 nodePort: 40002
protocol: TCP protocol: TCP
selector: selector:
app: ibzuaa-provider-api app: ibzuaa-provider-api
......
...@@ -3,9 +3,24 @@ services: ...@@ -3,9 +3,24 @@ services:
ibzuaa-provider-api: ibzuaa-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports: ports:
- "8081:8081" - "40002:40002"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40002
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- IBIZ_OAUTH2_ENABLE=true
- NACOS=172.16.100.243:8848
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy: deploy:
resources: resources:
limits: limits:
......
...@@ -24,6 +24,10 @@ public class IBZUAAFallback implements IBZUAAFeignClient { ...@@ -24,6 +24,10 @@ public class IBZUAAFallback implements IBZUAAFeignClient {
return null; return null;
} }
@Override
public Object getToken(MultiValueMap<String, String> map){
return null;
}
@Override @Override
public String getPublicKey() { public String getPublicKey() {
return null; return null;
......
...@@ -27,6 +27,13 @@ public interface IBZUAAFeignClient ...@@ -27,6 +27,13 @@ public interface IBZUAAFeignClient
@PostMapping(value = "/uaa/login") @PostMapping(value = "/uaa/login")
AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin); AuthenticationUser login(@RequestBody AuthorizationLogin authorizationLogin);
/**
* oauth2认证
* @param 校验信息
* @return
*/
@RequestMapping(method = RequestMethod.POST, value = "/oauth/token")
Object getToken(@RequestBody MultiValueMap<String,String> map);
@PostMapping(value = "/uaa/loginbyusername") @PostMapping(value = "/uaa/loginbyusername")
AuthenticationUser loginByUsername(@RequestBody String username); AuthenticationUser loginByUsername(@RequestBody String username);
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册